diff options
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 3 | 
2 files changed, 6 insertions, 0 deletions
| diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index bc542d325e..512ef340f9 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1409,6 +1409,7 @@ void LLShaderMgr::initAttribsAndUniforms()      mReservedUniforms.push_back("detail_3");      mReservedUniforms.push_back("alpha_ramp"); +    mReservedUniforms.push_back("paint_map");      mReservedUniforms.push_back("detail_0_base_color");      mReservedUniforms.push_back("detail_1_base_color"); @@ -1433,6 +1434,8 @@ void LLShaderMgr::initAttribsAndUniforms()      mReservedUniforms.push_back("emissiveColors");      mReservedUniforms.push_back("minimum_alphas"); +    mReservedUniforms.push_back("region_scale"); +      mReservedUniforms.push_back("origin");      mReservedUniforms.push_back("display_gamma"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 921ef20997..2b76ef664b 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -267,6 +267,7 @@ public:          TERRAIN_DETAIL3,                    //  "detail_3"          TERRAIN_ALPHARAMP,                  //  "alpha_ramp" +        TERRAIN_PAINTMAP,                   //  "paint_map"          TERRAIN_DETAIL0_BASE_COLOR,                //  "detail_0_base_color" (GLTF)          TERRAIN_DETAIL1_BASE_COLOR,                //  "detail_1_base_color" (GLTF) @@ -291,6 +292,8 @@ public:          TERRAIN_EMISSIVE_COLORS,                   //  "emissiveColors" (GLTF)          TERRAIN_MINIMUM_ALPHAS,                    //  "minimum_alphas" (GLTF) +        REGION_SCALE,                              //  "region_scale" (GLTF) +          SHINY_ORIGIN,                       //  "origin"          DISPLAY_GAMMA,                      //  "display_gamma" | 
