diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-03 21:03:19 +0100 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-03 21:03:19 +0100 |
| commit | ca41d54386ccd5f02ed41dcdccf3b866da055499 (patch) | |
| tree | fbb6471e1afee5ef20e079afe9d949a358dc633f /indra/llrender | |
| parent | 42339b1e21aa7dd493f2d3ac8ce54a0817b8eb91 (diff) | |
| parent | d960676c5af26b299166bdd74744a7f513b45541 (diff) | |
Merge
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 a89ec675b4..b2be3cc3b6 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -674,12 +674,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 |