summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
committerGeenz <geenz@geenzo.com>2013-01-25 17:54:38 -0500
commit5f03e197f4cfb43de93dc42b16b54beafccd376a (patch)
tree77fe17e9c36021148c18f7f9f33aae5abcd100c0 /indra/llrender
parentcc7ae8fbd1fc249f77ced95171e5c22e48adedb6 (diff)
Trying to set materials up for rendering! Yay!
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.cpp2
-rw-r--r--indra/llrender/llshadermgr.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index e52411ebe5..b6b39028d3 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1124,6 +1124,8 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("global_gamma");
mReservedUniforms.push_back("texture_gamma");
+
+ mReservedUniforms.push_back("specular_color");
llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index a711a64919..a89e031906 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -168,6 +168,8 @@ public:
GLOBAL_GAMMA,
TEXTURE_GAMMA,
+ SPECULAR_COLOR,
+
END_RESERVED_UNIFORMS
} eGLSLReservedUniforms;