summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-11-11 14:06:33 -0800
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-11-11 14:06:33 -0800
commit4be5d07acb3c62383de092d1df3f0a5e239ca607 (patch)
tree8c7fb33a38d34eac1a6581af9ef82f3caf4c6ead /indra
parent19b2655a48696103fbccecbb0a672a9864980459 (diff)
MAINT-3429 remove GeForce hack which is causing issues with auto-alpha masks in deferred
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/lldrawpoolsimple.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 8926f64c64..0bc7ae766c 100755
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -37,8 +37,6 @@
#include "llviewershadermgr.h"
#include "llrender.h"
-#define GE_FORCE_WORKAROUND LL_DARWIN
-
static LLGLSLShader* simple_shader = NULL;
static LLGLSLShader* fullbright_shader = NULL;
@@ -660,14 +658,6 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass)
}
else
{
-
-// Work-around until we can figure out why the right shader causes
-// the GeForce driver to go tango uniform on OS X 10.6.8 only
-//
-#if GE_FORCE_WORKAROUND
- gObjectFullbrightAlphaMaskProgram.bind();
- gObjectFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f);
-#else
if (LLPipeline::sUnderWaterRender)
{
gDeferredFullbrightAlphaMaskWaterProgram.bind();
@@ -678,9 +668,7 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass)
gDeferredFullbrightAlphaMaskProgram.bind();
gDeferredFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f);
}
-#endif
}
-
}
void LLDrawPoolFullbrightAlphaMask::renderPostDeferred(S32 pass)
@@ -699,13 +687,6 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass)
}
else
{
-
-// Work-around until we can figure out why the right shader causes
-// the GeForce driver to go tango uniform on OS X 10.6.8 only
-//
-#if GE_FORCE_WORKAROUND
- gObjectFullbrightAlphaMaskProgram.unbind();
-#else
if (LLPipeline::sUnderWaterRender)
{
gDeferredFullbrightAlphaMaskWaterProgram.unbind();
@@ -714,8 +695,6 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass)
{
gDeferredFullbrightAlphaMaskProgram.unbind();
}
-#endif
-
}
LLRenderPass::endRenderPass(pass);
}