From 297cfeb3dc303664059a8f9ead662cb34cf72cd1 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 6 Jan 2025 00:13:49 +0000 Subject: [PATCH] FIRE-34483 Don't try to re-add extra maps on re-used rendertargets --- indra/newview/pipeline.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 38b0a78216..296cddcee3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -372,7 +372,13 @@ bool addDeferredAttachments(LLRenderTarget& target, bool for_impostor = false) U32 orm = GL_RGBA; U32 norm = GL_RGBA16F; U32 emissive = GL_RGB16F; - + // FIRE-34483 additional fix + if (target.getNumTextures() > 1) + { + LL_DEBUGS() << "LLPipeline::addDeferredAttachments() - target already has textures - skipping" << LL_ENDL; + return true; + } + // static LLCachedControl has_emissive(gSavedSettings, "RenderEnableEmissiveBuffer", false); static LLCachedControl has_hdr(gSavedSettings, "RenderHDREnabled", true); bool hdr = has_hdr() && gGLManager.mGLVersion > 4.05f;