summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-07-30 13:44:12 -0700
committerGraham Linden <graham@lindenlab.com>2013-07-30 13:44:12 -0700
commit42ce98e8bfe3fd633e15f703d5ffdad64c2965a5 (patch)
treed599fc890bf6eb650d94402fbe629812fe8c3dff /indra/newview/pipeline.cpp
parentc1b3f363cc8e1c64a1e116d4108d1ecb6b4d89b2 (diff)
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 05390f64f0..9aa375767b 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8695,6 +8695,12 @@ void LLPipeline::renderDeferredLighting()
unbindDeferredShader(gDeferredSpotLightProgram);
}
+ //reset mDeferredVB to fullscreen triangle
+ mDeferredVB->getVertexStrider(vert);
+ vert[0].set(-1,1,0);
+ vert[1].set(-1,-3,0);
+ vert[2].set(3,1,0);
+
{
LLGLDepthTest depth(GL_FALSE);
@@ -8713,10 +8719,6 @@ void LLPipeline::renderDeferredLighting()
F32 far_z = 0.f;
- bindDeferredShader(gDeferredMultiLightProgram[0]);
-
- mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX);
-
while (!fullscreen_lights.empty())
{
LLFastTimer ftm(FTM_FULLSCREEN_LIGHTS);
@@ -8742,13 +8744,11 @@ void LLPipeline::renderDeferredLighting()
gDeferredMultiLightProgram[idx].uniform1f(LLShaderMgr::MULTI_LIGHT_FAR_Z, far_z);
far_z = 0.f;
count = 0;
- mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX);
+ mDeferredVB->setBuffer(LLVertexBuffer::MAP_VERTEX);
mDeferredVB->drawArrays(LLRender::TRIANGLES, 0, 3);
unbindDeferredShader(gDeferredMultiLightProgram[idx]);
}
}
-
- unbindDeferredShader(gDeferredMultiLightProgram[0]);
bindDeferredShader(gDeferredMultiSpotLightProgram);