diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-04 18:06:29 -0600 |
| commit | 586025bde53ffcd160a9d169cca328ed5078f5f4 (patch) | |
| tree | 1f59d27d08567fd5f3fe02ce42fe6bae37bd3b2c /indra/newview/pipeline.cpp | |
| parent | 3ee3c3ced32bd1e67a6bea51341734c8764df018 (diff) | |
| parent | 609ed855e1160505238378a1be49e2b92e8496f5 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 690bf64798..54a62a858a 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7868,13 +7868,6 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, U32 light_index, U32 n shader.uniform2f(LLShaderMgr::DEFERRED_PROJ_SHADOW_RES, mShadow[4].getWidth(), mShadow[4].getHeight()); shader.uniform1f(LLShaderMgr::DEFERRED_DEPTH_CUTOFF, RenderEdgeDepthCutoff); shader.uniform1f(LLShaderMgr::DEFERRED_NORM_CUTOFF, RenderEdgeNormCutoff); - - static LLStaticHashedString sNormMat("norm_mat"); - if (shader.getUniformLocation(sNormMat) >= 0) - { - glh::matrix4f norm_mat = glh_get_current_modelview().inverse().transpose(); - shader.uniformMatrix4fv(sNormMat, 1, FALSE, norm_mat.m); - } } static LLFastTimer::DeclareTimer FTM_GI_TRACE("Trace"); @@ -7984,8 +7977,7 @@ void LLPipeline::renderDeferredLighting() } gDeferredSunProgram.uniform3fv(sOffset, slice, offset); - gDeferredSunProgram.uniform2f(sScreenRes, mDeferredLight.getWidth(), mDeferredLight.getHeight()); - + { LLGLDisable blend(GL_BLEND); LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_ALWAYS); |