Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hack for nvidia on osx.

Browse Source
This commit is contained in:
Shyotl
2013-11-13 12:53:43 -06:00
parent 3416b837dc
commit f03376cd2a
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/lldrawpoolsimple.cpp
View File

@@ -37,8 +37,6 @@
#include "llviewershadermgr.h" #include "llviewershadermgr.h"
#include "llrender.h" #include "llrender.h"
#define GE_FORCE_WORKAROUND LL_DARWIN
static LLGLSLShader* simple_shader = NULL; static LLGLSLShader* simple_shader = NULL;
static LLGLSLShader* fullbright_shader = NULL; static LLGLSLShader* fullbright_shader = NULL;
@@ -664,13 +662,6 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass)
else 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) if (LLPipeline::sUnderWaterRender)
{ {
gDeferredFullbrightAlphaMaskWaterProgram.bind(); gDeferredFullbrightAlphaMaskWaterProgram.bind();
@@ -681,7 +672,6 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass)
gDeferredFullbrightAlphaMaskProgram.bind(); gDeferredFullbrightAlphaMaskProgram.bind();
gDeferredFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); gDeferredFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f);
} }
#endif
} }
} }
@@ -704,13 +694,6 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass)
} }
else 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) if (LLPipeline::sUnderWaterRender)
{ {
gDeferredFullbrightAlphaMaskWaterProgram.unbind(); gDeferredFullbrightAlphaMaskWaterProgram.unbind();
@@ -719,8 +702,6 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass)
{ {
gDeferredFullbrightAlphaMaskProgram.unbind(); gDeferredFullbrightAlphaMaskProgram.unbind();
} }
#endif
} }
LLRenderPass::endRenderPass(pass); LLRenderPass::endRenderPass(pass);
} }