summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-07-29 18:59:45 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-07-29 18:59:45 -0700
commitb44e7303d85ffc59afe34a97342d83a04b180c48 (patch)
tree7ec816364f9c4027a3baad83641ccf3a2c521637 /indra/llrender/llshadermgr.cpp
parentbe89f2f8fb234cc8d0d511df2384422d92e134b8 (diff)
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rwxr-xr-xindra/llrender/llshadermgr.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index c3e76f5e0e..21b8322bf1 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -177,7 +177,12 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
if (features->hasSRGB)
{
+#if LL_DARWIN
+ if (!shader->attachObject("deferred/srgb_mac.glsl"))
+
+#else
if (!shader->attachObject("deferred/srgb.glsl"))
+#endif
{
return FALSE;
}