diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-18 21:36:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 21:36:56 +0300 |
| commit | 9a333e65c4019540d5675e72ac57ef5ab106aab0 (patch) | |
| tree | 55fa0d6d0de4521f0d8f764bb13b2e6c069602bb /indra/newview/pipeline.cpp | |
| parent | 3d5f1541dd9980196ba0c8a3c3396c8ed3384d1e (diff) | |
| parent | 4cccf8af43c8ebd9f947b9050a0403f65d0de7ee (diff) | |
Merge develop into release/2025.04
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6c5fd855fd..493fcd5d45 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -121,7 +121,7 @@ #include "SMAAAreaTex.h" #include "SMAASearchTex.h" - +#include "llerror.h" #ifndef LL_WINDOWS #define A_GCC 1 #pragma GCC diagnostic ignored "-Wunused-function" @@ -599,7 +599,6 @@ void LLPipeline::init() connectRefreshCachedSettingsSafe("RenderMirrors"); connectRefreshCachedSettingsSafe("RenderHeroProbeUpdateRate"); connectRefreshCachedSettingsSafe("RenderHeroProbeConservativeUpdateMultiplier"); - connectRefreshCachedSettingsSafe("RenderAutoHideSurfaceAreaLimit"); LLPointer<LLControlVariable> cntrl_ptr = gSavedSettings.getControl("CollectFontVertexBuffers"); if (cntrl_ptr.notNull()) @@ -1286,8 +1285,11 @@ void LLPipeline::createGLBuffers() } allocateScreenBuffer(resX, resY); - mRT->width = 0; - mRT->height = 0; + // Do not zero out mRT dimensions here. allocateScreenBuffer() above + // already sets the correct dimensions. Zeroing them caused resizeShadowTexture() + // to fail if called immediately after createGLBuffers (e.g., post graphics change). + // mRT->width = 0; + // mRT->height = 0; if (!mNoiseMap) |