merge changes for 3.7.3-release

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);
 }