diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-03 10:01:39 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-03 10:01:39 -0400 |
| commit | 21ddaa690875450bbd2f7d665da22d390a0f2a88 (patch) | |
| tree | d74fb7b660bcbf1defba3bcb009e6c47555fae96 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 2a10bd406c9155d30a82657ce2ee532b3a677d83 (diff) | |
| parent | e09475713b7abe6fcb916f4a770081a1696b57ab (diff) | |
DRTVWR-559: Merge remote branch 'DRTVWR-559' into DRTVWR-559-zapfunc
Delete the debugLoggingEnabled() (changed to LL_DEBUGS()) stanzas deleted by
the upstream.
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 404039189b..ec57e20d35 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -107,12 +107,10 @@ static void prepare_alpha_shader(LLGLSLShader* shader, bool textureGamma, bool d // i.e. shaders\class1\deferred\alphaF.glsl if (deferredEnvironment) { - gPipeline.bindDeferredShader( *shader ); - } - else - { - shader->bind(); + shader->mCanBindFast = false; } + + shader->bind(); shader->uniform1f(LLShaderMgr::DISPLAY_GAMMA, (gamma > 0.1f) ? 1.0f / gamma : (1.0f / 2.2f)); if (LLPipeline::sRenderingHUDs) |