diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-29 16:57:28 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-29 16:57:28 +0000 |
| commit | df85976a1fbc34dbcda286f29a36e39a6f16fdd5 (patch) | |
| tree | 9b98489f636295e1ed85484adc24609809d9b202 /indra | |
| parent | c09e933012d4ba607a066f0e857c1e5e543a59c3 (diff) | |
| parent | 3236b1a806acf0743d62e9bba18873de8fd4dec1 (diff) | |
Merged in euclid-13406-lmr (pull request #219)
SL-13406 fix an end-scope enable error in glow rendering
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/pipeline.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 3f8f7b278f..df5765c99b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7592,33 +7592,36 @@ void LLPipeline::renderFinalize() gGlowExtractProgram.uniform3f(LLShaderMgr::GLOW_WARMTH_WEIGHTS, warmthWeights.mV[0], warmthWeights.mV[1], warmthWeights.mV[2]); gGlowExtractProgram.uniform1f(LLShaderMgr::GLOW_WARMTH_AMOUNT, warmthAmount); - LLGLEnable blend_on(GL_BLEND); - LLGLEnable test(GL_ALPHA_TEST); + + { + LLGLEnable blend_on(GL_BLEND); + LLGLEnable test(GL_ALPHA_TEST); - gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA); + gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA); - mScreen.bindTexture(0, 0, LLTexUnit::TFO_POINT); + mScreen.bindTexture(0, 0, LLTexUnit::TFO_POINT); - gGL.color4f(1, 1, 1, 1); - gPipeline.enableLightsFullbright(); - gGL.begin(LLRender::TRIANGLE_STRIP); - gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); - gGL.vertex2f(-1, -1); + gGL.color4f(1, 1, 1, 1); + gPipeline.enableLightsFullbright(); + gGL.begin(LLRender::TRIANGLE_STRIP); + gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); + gGL.vertex2f(-1, -1); - gGL.texCoord2f(tc1.mV[0], tc2.mV[1]); - gGL.vertex2f(-1, 3); + gGL.texCoord2f(tc1.mV[0], tc2.mV[1]); + gGL.vertex2f(-1, 3); - gGL.texCoord2f(tc2.mV[0], tc1.mV[1]); - gGL.vertex2f(3, -1); + gGL.texCoord2f(tc2.mV[0], tc1.mV[1]); + gGL.vertex2f(3, -1); - gGL.end(); + gGL.end(); - gGL.getTexUnit(0)->unbind(mScreen.getUsage()); + gGL.getTexUnit(0)->unbind(mScreen.getUsage()); - mGlow[2].flush(); + mGlow[2].flush(); - tc1.setVec(0, 0); - tc2.setVec(2, 2); + tc1.setVec(0, 0); + tc2.setVec(2, 2); + } // power of two between 1 and 1024 U32 glowResPow = RenderGlowResolutionPow; |