diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-30 11:06:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-30 11:06:16 -0500 |
| commit | 4a1b6bdeef3753a65cb11ccbad151560da508e15 (patch) | |
| tree | ad5c7a192f2438805ab924f21da5b4664bb2f949 /indra/llrender/llshadermgr.cpp | |
| parent | 7931cac194944518047dac73a6c01c20aa7b3a18 (diff) | |
| parent | ee4c2e837bd9b414997ba75e823ac533fc4b82bc (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index ef78d43665..37b9c0e0e0 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -695,6 +695,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } */ + text[count++] = strdup("#define HAS_DIFFUSE_LOOKUP 1\n"); + //uniform declartion for (S32 i = 0; i < texture_index_channels; ++i) { @@ -752,6 +754,10 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade llerrs << "Indexed texture rendering requires GLSL 1.30 or later." << llendl; } } + else + { + text[count++] = strdup("#define HAS_DIFFUSE_LOOKUP 0\n"); + } //copy file into memory while( fgets((char *)buff, 1024, file) != NULL && count < LL_ARRAY_SIZE(text) ) @@ -1068,6 +1074,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("minimum_alpha"); + mReservedUniforms.push_back("emissive_brightness"); mReservedUniforms.push_back("shadow_matrix"); mReservedUniforms.push_back("env_mat"); |