diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-29 18:48:09 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-29 18:48:09 -0500 |
| commit | 743d1a777e5c2827d50051c3f5e0942a870a6ff9 (patch) | |
| tree | 67f264a5c799003a0eaebcd5e729c315f53a42bc /indra/llrender/llshadermgr.cpp | |
| parent | e6de3d6232a12ace8f669abd4ede4c6f586046df (diff) | |
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 874996dd10..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) ) |