diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-01-10 18:42:21 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-01-10 18:42:21 -0600 |
| commit | 28c245b071e0dfdbacce6f287eb80f57f850d857 (patch) | |
| tree | fcc0c662296e3fb2b13394f6a4db3ec058c7e436 /indra/newview/pipeline.cpp | |
| parent | 68da705f3ba284928c7e23acd4164d56dea17af9 (diff) | |
| parent | c6ea8f9c825e823c4f1130d3448eb83a02b8af87 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d56b31a372..6ac059df91 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -855,8 +855,6 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) S32 shadow_detail = RenderShadowDetail; bool ssao = RenderDeferredSSAO; - const U32 occlusion_divisor = 3; - //allocate deferred rendering color buffers if (!mRT->deferredScreen.allocate(resX, resY, GL_RGBA, true, true, LLTexUnit::TT_TEXTURE, false, samples)) return false; if (!addDeferredAttachments(mRT->deferredScreen)) return false; @@ -2495,10 +2493,10 @@ void LLPipeline::downsampleDepthBuffer(LLRenderTarget& source, LLRenderTarget& d if (scratch_space) { +#if 0 // TODO -- restore occlusion culling functionality GLint bits = 0; bits = GL_DEPTH_BUFFER_BIT; -#if 0 // TODO -- restore occlusion culling functionality - scratch_space->copyContents(source, + scratch_space->copyContents(source, 0, 0, source.getWidth(), source.getHeight(), 0, 0, scratch_space->getWidth(), scratch_space->getHeight(), bits, GL_NEAREST); #endif |