diff options
| author | Palmer <palmer@lindenlab.com> | 2010-04-05 19:37:09 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-04-05 19:37:09 -0700 |
| commit | b5e12269e18bc9074b96f115085d5540ef1d7545 (patch) | |
| tree | 1f7779ee639c4a53a88a3f97e4cb47b3a8e96a5e /indra | |
| parent | 1aa0161b230f01eea3f62b8baacce8a7acc18187 (diff) | |
applied render-pipeline-7 @ 137608. This fixes empty depth buffer during highlight render
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index f09ae1f8f4..f796fb5451 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1112,7 +1112,7 @@ void render_ui(F32 zoom_factor, int subfield) { gPipeline.renderBloom(gSnapshot, zoom_factor, subfield); } - + render_hud_elements(); render_hud_attachments(); } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8b48dd10d3..5e54d4ab78 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -5803,6 +5803,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) gGL.getTexUnit(0)->activate(); gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT); + + if (LLRenderTarget::sUseFBO) + { //copy depth buffer from mScreen to framebuffer + LLRenderTarget::copyContentsToFramebuffer(mScreen, 0, 0, mScreen.getWidth(), mScreen.getHeight(), + 0, 0, mScreen.getWidth(), mScreen.getHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST); + } } |