diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-14 11:22:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-14 11:22:39 -0400 |
| commit | 7ffa456683ed7babd8abf16d48f0871a7001f3e6 (patch) | |
| tree | 0ca61fabcce55de740da7105b22d439456d77f2e /indra/llrender | |
| parent | e271fe7091e76373c277625ffcb2cba0c9a02746 (diff) | |
STORM-2080: correct fitted mesh rendering on some ATI cards
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 95a2c8b589..663d3e8b0f 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -670,12 +670,17 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade if (defines) { for (boost::unordered_map<std::string,std::string>::iterator iter = defines->begin(); iter != defines->end(); ++iter) - { - 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( gGLManager.mIsATI ) + { + text[ count++ ] = strdup( "#define IS_AMD_CARD 1\n" ); + } + if (texture_index_channels > 0 && type == GL_FRAGMENT_SHADER_ARB) { //use specified number of texture channels for indexed texture rendering |