diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-16 14:49:47 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-16 14:49:47 -0600 |
| commit | bc4694e82a5fa7aaafe77e9e3cb84f5b781e741a (patch) | |
| tree | 23331eb6ad43cca3fdc91ad6e1b8f6f126cf1071 /indra/newview/pipeline.cpp | |
| parent | 8d2ac419b22c8c9475f2efb312dd198ac8eb9fb7 (diff) | |
| parent | 07ada65df1c72adff6e356011840ca262beb4be0 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d2c079baa6..a2e01eec3f 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7616,7 +7616,7 @@ void LLPipeline::renderFinalize() LLRenderTarget *screen_target = &mRT->screen; screen_target->bindTarget(); - S32 channel = gPostScreenSpaceReflectionProgram.enableTexture(LLShaderMgr::DIFFUSE_MAP, mRT->fxaaBuffer.getUsage()); + S32 channel = gPostScreenSpaceReflectionProgram.enableTexture(LLShaderMgr::DIFFUSE_MAP, screen_target->getUsage()); if (channel > -1) { screen_target->bindTexture(0, channel, LLTexUnit::TFO_POINT); @@ -7624,8 +7624,9 @@ void LLPipeline::renderFinalize() } { - LLGLDisable blend(GL_BLEND); + LLGLDisable blend(GL_BLEND); LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_ALWAYS); + stop_glerror(); mDeferredVB->drawArrays(LLRender::TRIANGLES, 0, 3); stop_glerror(); |