diff options
| author | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
| commit | 536e38ad51b89808f26d8e3cd107fe093862d22a (patch) | |
| tree | 230159ae9e319f5c419f1a643177b2bbb17d52c5 /indra/newview/lldrawpoolsimple.cpp | |
| parent | 760adead96e62cab8f9cdacc6469773a87dfbc1a (diff) | |
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
Diffstat (limited to 'indra/newview/lldrawpoolsimple.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolsimple.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index 331536fdca..ca7a1b47c2 100644 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -47,6 +47,9 @@ static LLGLSLShader* simple_shader = NULL; static LLGLSLShader* fullbright_shader = NULL; +static LLFastTimer::DeclareTimer FTM_RENDER_SIMPLE_DEFERRED("Deferred Simple"); +static LLFastTimer::DeclareTimer FTM_RENDER_GRASS_DEFERRED("Deferred Grass"); + void LLDrawPoolGlow::render(S32 pass) { LLFastTimer t(FTM_RENDER_GLOW); @@ -156,13 +159,13 @@ void LLDrawPoolSimple::render(S32 pass) void LLDrawPoolSimple::beginDeferredPass(S32 pass) { - LLFastTimer t(FTM_RENDER_SIMPLE); + LLFastTimer t(FTM_RENDER_SIMPLE_DEFERRED); gDeferredDiffuseProgram.bind(); } void LLDrawPoolSimple::endDeferredPass(S32 pass) { - LLFastTimer t(FTM_RENDER_SIMPLE); + LLFastTimer t(FTM_RENDER_SIMPLE_DEFERRED); LLRenderPass::endRenderPass(pass); gDeferredDiffuseProgram.unbind(); @@ -174,7 +177,7 @@ void LLDrawPoolSimple::renderDeferred(S32 pass) LLGLDisable alpha_test(GL_ALPHA_TEST); { //render simple - LLFastTimer t(FTM_RENDER_SIMPLE); + LLFastTimer t(FTM_RENDER_SIMPLE_DEFERRED); renderTexture(LLRenderPass::PASS_SIMPLE, getVertexDataMask()); } } @@ -258,10 +261,10 @@ void LLDrawPoolGrass::endDeferredPass(S32 pass) void LLDrawPoolGrass::renderDeferred(S32 pass) { - gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f); + gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f); { - LLFastTimer t(FTM_RENDER_GRASS); + LLFastTimer t(FTM_RENDER_GRASS_DEFERRED); gDeferredTreeProgram.bind(); LLGLEnable test(GL_ALPHA_TEST); //render grass |