diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-27 10:34:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-27 10:34:54 -0500 |
| commit | eb4581edf27a19641e3cd29c54a161548544fbeb (patch) | |
| tree | 21a57c4a6d6f961f8bc6e1db6ec36f98429be199 | |
| parent | 0e02f25604ac8518b23fcb0b466866013c90dc91 (diff) | |
SL-18454 Fix for HUDs with alpha mask using wrong shader.
| -rw-r--r-- | indra/newview/lldrawpoolsimple.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index e324a663f4..57aa1c73f0 100644 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -512,7 +512,7 @@ void LLDrawPoolFullbrightAlphaMask::renderPostDeferred(S32 pass) LLGLSLShader* shader = nullptr; if (LLPipeline::sRenderingHUDs) { - shader = &gObjectFullbrightAlphaMaskProgram; + shader = &gDeferredFullbrightAlphaMaskProgram; } else if (LLPipeline::sRenderDeferred) { diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index ed3631be99..c2f9779a53 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1597,6 +1597,7 @@ void render_ui_2d() // render outline for HUD if (isAgentAvatarValid() && gAgentCamera.mHUDCurZoom < 0.98f) { + gUIProgram.bind(); gGL.pushMatrix(); S32 half_width = (gViewerWindow->getWorldViewWidthScaled() / 2); S32 half_height = (gViewerWindow->getWorldViewHeightScaled() / 2); @@ -1607,6 +1608,7 @@ void render_ui_2d() gGL.color4fv(LLColor4::white.mV); gl_rect_2d(-half_width, half_height, half_width, -half_height, FALSE); gGL.popMatrix(); + gUIProgram.unbind(); stop_glerror(); } |