diff options
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
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(); } |