diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:34:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:34:05 +0100 |
| commit | 617e9614455fb8c70fb6c219ceeab0b53adf25b5 (patch) | |
| tree | 8e79762251a307cedbac037ece893cf12b0ef9b2 /indra/newview/lldrawpoolsimple.cpp | |
| parent | e5273960de222ffae32405fde8e9fd566ff72d0a (diff) | |
| parent | d0a6165713aa94654f7948151c6fbbe0a7d315f2 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/lldrawpoolsimple.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsimple.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index ca7a1b47c2..91191287cd 100644 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -55,6 +55,10 @@ void LLDrawPoolGlow::render(S32 pass) LLFastTimer t(FTM_RENDER_GLOW); LLGLEnable blend(GL_BLEND); LLGLDisable test(GL_ALPHA_TEST); + gGL.flush(); + /// Get rid of z-fighting with non-glow pass. + LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL); + glPolygonOffset(-1.0f, -1.0f); gGL.setSceneBlendType(LLRender::BT_ADD); U32 shader_level = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT); @@ -147,7 +151,8 @@ void LLDrawPoolSimple::render(S32 pass) renderTexture(LLRenderPass::PASS_SIMPLE, getVertexDataMask()); if (LLPipeline::sRenderDeferred) - { + { //if deferred rendering is enabled, bump faces aren't reigstered as simple + //render bump faces here as simple so bump faces will appear under water renderTexture(LLRenderPass::PASS_BUMP, getVertexDataMask()); } } |