diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-03 15:17:29 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-03 15:17:29 -0500 |
commit | ab88aa5b3409dac17e8464fe2262796e24b606b4 (patch) | |
tree | e32845204565e5631ea12f9112a38d0618e9a9c8 /indra | |
parent | b19d8fad3c0e32987c19eecd5dac4a303555762f (diff) |
MATBUG-151 Fix for black textures on Intel HD when glow is present.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/lldrawpoolsimple.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index 7ca87d3858..3221369fa0 100755 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -47,6 +47,7 @@ static LLFastTimer::DeclareTimer FTM_RENDER_GRASS_DEFERRED("Deferred Grass"); void LLDrawPoolGlow::beginPostDeferredPass(S32 pass) { gDeferredEmissiveProgram.bind(); + gDeferredEmissiveProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); } static LLFastTimer::DeclareTimer FTM_RENDER_GLOW_PUSH("Glow Push"); @@ -110,6 +111,7 @@ void LLDrawPoolGlow::render(S32 pass) LLGLSLShader* shader = LLPipeline::sUnderWaterRender ? &gObjectEmissiveWaterProgram : &gObjectEmissiveProgram; shader->bind(); + shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 1.f); LLGLDepthTest depth(GL_TRUE, GL_FALSE); gGL.setColorMask(false, true); |