diff options
| author | Jonathan Goodman <geenz@geenzo.com> | 2012-08-29 03:41:26 -0400 |
|---|---|---|
| committer | Jonathan Goodman <geenz@geenzo.com> | 2012-08-29 03:41:26 -0400 |
| commit | c911efb953a600092a6213c088d5b94fcf7779d3 (patch) | |
| tree | 6f8ab49cfedcd93299a322fca598482b9d0892d3 /indra/llrender | |
| parent | 99371f892e7b35739be01e63036b4355e0e4dfe7 (diff) | |
Just pass in an empty preprocessor definition map from now on. The shader compiler won't add new #defines if it's empty.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index d15584d2e1..4f7f845c70 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -660,11 +660,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade for (std::map<std::string,std::string>::iterator iter = defines.begin(); iter != defines.end(); ++iter) { - if (iter->first != "NULL") - { - std::string define = "#define " + iter->first + " " + iter->second + "\n"; - text[count++] = (GLcharARB *) strdup(define.c_str()); - } + std::string define = "#define " + iter->first + " " + iter->second + "\n"; + text[count++] = (GLcharARB *) strdup(define.c_str()); } if (texture_index_channels > 0 && type == GL_FRAGMENT_SHADER_ARB) |