diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-04 08:04:18 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-04 08:04:18 -0800 |
| commit | 45a541d2d5ccff4279441c715d3f80890e71beb9 (patch) | |
| tree | f16c1cf45d8bd5e2d4d021ed7b01d729f545d688 /indra/newview/llviewerdisplay.cpp | |
| parent | 4c3050a3953153aa8753fc10706ad2ef464f3e3d (diff) | |
SL-10566
Disable pre-cull of water causing refraction/reflection map generation more than is necessary.
Re-org alpha draws to limit state changes based on render type.
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 5d01e7e584..5fdc9d8e41 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1026,6 +1026,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gPipeline.renderDeferredLighting(&gPipeline.mScreen); } + if (to_texture) + { + gPipeline.renderBloom(gSnapshot, zoom_factor, subfield); + } + LLPipeline::sUnderWaterRender = FALSE; { @@ -1285,14 +1290,6 @@ void render_ui(F32 zoom_factor, int subfield) } { - BOOL to_texture = gPipeline.canUseVertexShaders() && - LLPipeline::sRenderGlow; - - if (to_texture) - { - gPipeline.renderBloom(gSnapshot, zoom_factor, subfield); - } - render_hud_elements(); render_hud_attachments(); } |