diff options
author | Dave Parks <davep@lindenlab.com> | 2013-06-18 19:51:02 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-06-18 19:51:02 -0500 |
commit | 45b1466de60dc1788353508debbb321b59875884 (patch) | |
tree | a73c4c9f105ba437df2aa3739c0d09739d1805a4 | |
parent | ccd04cd66c0a550694fefe41042ef47466780a92 (diff) |
Review cleanup
-rwxr-xr-x | indra/llrender/llrendertarget.cpp | 4 | ||||
-rwxr-xr-x | indra/newview/pipeline.cpp | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 752486fdde..6e22712b94 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -56,13 +56,9 @@ U32 LLRenderTarget::sCurFBO = 0; extern S32 gGLViewport[4]; -//HEY DAVE HOOK THESE UP U32 LLRenderTarget::sCurResX = 0; U32 LLRenderTarget::sCurResY = 0; - -/// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - LLRenderTarget::LLRenderTarget() : mResX(0), mResY(0), diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6efdf47ec5..30c726f76a 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2676,9 +2676,7 @@ void LLPipeline::downsampleDepthBuffer(LLRenderTarget& source, LLRenderTarget& d } dest.bindTarget(); - - - gDownsampleDepthProgram.bind(); + dest.clear(GL_DEPTH_BUFFER_BIT); LLStrider<LLVector3> vert; mDeferredVB->getVertexStrider(vert); @@ -2719,7 +2717,7 @@ void LLPipeline::downsampleDepthBuffer(LLRenderTarget& source, LLRenderTarget& d } else { - gDownsampleDepthProgram.unbind(); + shader->unbind(); } } |