summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-23 12:47:52 -0500
committerDave Parks <davep@lindenlab.com>2013-05-23 12:47:52 -0500
commit933d4c40f42babf74320dca70ac08009b8577fa1 (patch)
treec1c7f29374232a21ec4e4dc567ddc72226b70c36 /indra/llrender
parent4c522f82124328157e273bbc0813198d85a15f0f (diff)
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
Diffstat (limited to 'indra/llrender')
-rwxr-xr-xindra/llrender/llshadermgr.cpp1
-rwxr-xr-xindra/llrender/llshadermgr.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index ef78d43665..874996dd10 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1068,6 +1068,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("minimum_alpha");
+ mReservedUniforms.push_back("emissive_brightness");
mReservedUniforms.push_back("shadow_matrix");
mReservedUniforms.push_back("env_mat");
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index a33eca4448..c049e935b8 100755
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -109,6 +109,7 @@ public:
GLOW_DELTA,
MINIMUM_ALPHA,
+ EMISSIVE_BRIGHTNESS,
DEFERRED_SHADOW_MATRIX,
DEFERRED_ENV_MAT,