diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-06-15 14:52:17 -0500 | 
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-06-15 14:52:17 -0500 | 
| commit | 6f767db34992b04d67cb25bf976581aee4acac78 (patch) | |
| tree | 38aff025d05613899ce4cca1a6465550ad44f005 /indra/llrender | |
| parent | 47be24e467a9fe5a2c0466a49f58769f6b81fdc4 (diff) | |
| parent | 44f26248ec668635b5d5b161f4736a670d364792 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 1 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 1 | 
2 files changed, 2 insertions, 0 deletions
| diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index f398526b41..75d6ef6c46 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1341,6 +1341,7 @@ void LLShaderMgr::initAttribsAndUniforms()      mReservedUniforms.push_back("depthRejectBias");      mReservedUniforms.push_back("glossySampleCount");      mReservedUniforms.push_back("noiseSine"); +    mReservedUniforms.push_back("adaptiveStepMultiplier");      mReservedUniforms.push_back("modelview_delta");      mReservedUniforms.push_back("inv_modelview_delta"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 5d7ab7c53d..46f352aa58 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -166,6 +166,7 @@ public:          DEFERRED_SSR_REJECT_BIAS,           //  "depthRejectBias"          DEFERRED_SSR_GLOSSY_SAMPLES,        //  "glossySampleCount"          DEFERRED_SSR_NOISE_SINE,            //  "noiseSine" +        DEFERRED_SSR_ADAPTIVE_STEP_MULT,    //  "adaptiveStepMultiplier"          MODELVIEW_DELTA_MATRIX,             //  "modelview_delta"          INVERSE_MODELVIEW_DELTA_MATRIX,     //  "inv_modelview_delta" | 
