summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-30 12:17:04 -0500
committerGeenz <geenz@geenzo.com>2013-01-30 12:17:04 -0500
commitaa1befd689703d9fea50399201911e0f8fca6ac6 (patch)
treec60457d1762d8b1c28a9d40130ba2988f532cd27 /indra/llrender
parent66a01ba4c581d79227b0e67f5f75dc248fcaf7ab (diff)
Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.cpp1
-rw-r--r--indra/llrender/llshadermgr.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index b6b39028d3..9b2874c79d 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1126,6 +1126,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("texture_gamma");
mReservedUniforms.push_back("specular_color");
+ mReservedUniforms.push_back("env_intensity");
llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index a89e031906..1c97ab4e60 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -169,6 +169,7 @@ public:
TEXTURE_GAMMA,
SPECULAR_COLOR,
+ ENVIRONMENT_INTENSITY,
END_RESERVED_UNIFORMS
} eGLSLReservedUniforms;