diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-07-28 18:29:51 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-07-28 18:29:51 -0700 |
| commit | be89f2f8fb234cc8d0d511df2384422d92e134b8 (patch) | |
| tree | 870daf8435729a42fb95d4139299552d29114782 /indra/newview/llviewershadermgr.cpp | |
| parent | c5fc5d9b46121bb0d44d3b35402d604514e2dd4e (diff) | |
NORSPEC-314 fixed another mac-specific stupidity by splitting out a new srgb_mac version of the shader
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 6e2139ea9e..545a236f81 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -936,12 +936,14 @@ BOOL LLViewerShaderMgr::loadBasicShaders() index_channels.push_back(ch); shaders.push_back( make_pair( "lighting/lightShinyWaterF.glsl", mVertexShaderLevel[SHADER_LIGHTING] ) ); index_channels.push_back(ch); shaders.push_back( make_pair( "lighting/lightFullbrightShinyWaterF.glsl", mVertexShaderLevel[SHADER_LIGHTING] ) ); - index_channels.push_back(-1); shaders.push_back( make_pair( "deferred/srgb.glsl", mVertexShaderLevel[SHADER_DEFERRED] ) ); // work-around for missing mix(vec3,vec3,bvec3) on decrepit GLSLs // #if LL_DARWIN - attribs["OLD_SELECT"] = "1"; + attribs["OLD_SELECT"] = "1"; + index_channels.push_back(-1); shaders.push_back( make_pair( "deferred/srgb_mac.glsl", mVertexShaderLevel[SHADER_DEFERRED] ) ); +#else + index_channels.push_back(-1); shaders.push_back( make_pair( "deferred/srgb.glsl", mVertexShaderLevel[SHADER_DEFERRED] ) ); #endif for (U32 i = 0; i < shaders.size(); i++) |