diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-25 13:02:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-25 13:02:07 -0700 |
| commit | d7e5d8d11bfbbaf6e01e32cdf45eb6f5dc78fce6 (patch) | |
| tree | d87c9eb8185d8d4bf43ae458a23cf43256dab3df /indra/newview | |
| parent | d86464182dd69aac5368f77dbb11a3e84ce4dadb (diff) | |
Put bloom rendering back as it was.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/mid_graphics.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 20 |
2 files changed, 14 insertions, 8 deletions
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml index f989fe7381..a10c02b79f 100644 --- a/indra/newview/app_settings/mid_graphics.xml +++ b/indra/newview/app_settings/mid_graphics.xml @@ -19,7 +19,7 @@ <!--bump okay--> <RenderObjectBump value="TRUE"/> <!--NO SHADERS--> - <RenderReflectionDetail value="1"/> + <RenderReflectionDetail value="0"/> <!--Simple--> <RenderTerrainDetail value="1"/> <!--Default for now--> diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 0862113999..736626debd 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -717,7 +717,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) if (!for_snapshot) { - gPipeline.generateSunShadow(*LLViewerCamera::getInstance()); + if (gFrameCount > 1) + { //for some reason, ATI 4800 series will error out if you + //try to generate a shadow before the first frame is through + gPipeline.generateSunShadow(*LLViewerCamera::getInstance()); + } LLVertexBuffer::unbind(); @@ -1022,11 +1026,6 @@ 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; { @@ -1288,7 +1287,14 @@ void render_ui(F32 zoom_factor, int subfield) } { - LL_RECORD_BLOCK_TIME(FTM_RENDER_UI_HUD); + BOOL to_texture = gPipeline.canUseVertexShaders() && + LLPipeline::sRenderGlow; + + if (to_texture) + { + gPipeline.renderBloom(gSnapshot, zoom_factor, subfield); + } + render_hud_elements(); render_hud_attachments(); } |