diff options
| author | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-06 19:53:18 +0000 |
|---|---|---|
| committer | Jonathan Goodman <geenz@lindenlab.com> | 2022-10-06 19:53:18 +0000 |
| commit | a73b226f9ee1df4803da8acbcfcef579254a51a4 (patch) | |
| tree | 915f5afdaa373706f49e92424b30ffef4bd537b6 /indra/llrender | |
| parent | db92f9564992b9910b21f3de57a584ccfa199e75 (diff) | |
| parent | 2b28fecf4893e103e99328e5b4a13c607498396d (diff) | |
Merged DRTVWR-559 into SL-18290
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrendertarget.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index b0da054d76..7fcb130ac6 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -623,6 +623,8 @@ void LLRenderTarget::flush(bool fetch_depth) void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0, S32 srcX1, S32 srcY1, S32 dstX0, S32 dstY0, S32 dstX1, S32 dstY1, U32 mask, U32 filter) { + LL_PROFILE_GPU_ZONE("LLRenderTarget::copyContents"); + GLboolean write_depth = mask & GL_DEPTH_BUFFER_BIT ? TRUE : FALSE; LLGLDepthTest depth(write_depth, write_depth); diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 8807433d80..a363eac59e 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -214,7 +214,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } // we want this BEFORE shadows and AO because those facilities use pos/norm access - if (features->isDeferred) + if (features->isDeferred || features->hasReflectionProbes) { if (!shader->attachFragmentObject("deferred/deferredUtil.glsl")) { |