diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index e3e086d799..8f42d7c71e 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -191,9 +191,7 @@ bool LLViewerDynamicTexture::updateAllInstances() return true; } - // Auxillary render target pack for 1024px LLDynamicTexture - //LLRenderTarget& bake_target = gPipeline.mAuxillaryRT.deferredScreen; - LLRenderTarget& bake_target = gPipeline.mDynamicTextureRT.deferredScreen; + LLRenderTarget& bake_target = gPipeline.mAuxillaryRT.deferredScreen; if (!bake_target.isComplete()) { diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bacccd9322..9c35258aa8 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -234,9 +234,7 @@ S32 LLPipeline::RenderHeroProbeUpdateRate; S32 LLPipeline::RenderHeroProbeConservativeUpdateMultiplier; LLTrace::EventStatHandle LLPipeline::sStatBatchSize("renderbatchsize"); -// 1024px previews -//const U32 LLPipeline::MAX_BAKE_WIDTH = 512; -const U32 LLPipeline::MAX_BAKE_WIDTH = 1024; +const U32 LLPipeline::MAX_BAKE_WIDTH = 512; const F32 BACKLIGHT_DAY_MAGNITUDE_OBJECT = 0.1f; const F32 BACKLIGHT_NIGHT_MAGNITUDE_OBJECT = 0.08f; @@ -865,12 +863,6 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) allocateScreenBufferInternal(res, res); } - // Auxillary render target pack for 1024px LLDynamicTexture - mRT = &mDynamicTextureRT; - res = MAX_BAKE_WIDTH; - allocateScreenBufferInternal(res, res); - // - mRT = &mMainRT; gCubeSnapshot = false; } @@ -1296,12 +1288,6 @@ void LLPipeline::releaseScreenBuffers() mHeroProbeRT.screen.release(); mHeroProbeRT.deferredScreen.release(); mHeroProbeRT.deferredLight.release(); - - // Auxillary render target pack for 1024px LLDynamicTexture - mDynamicTextureRT.screen.release(); - mDynamicTextureRT.deferredScreen.release(); - mDynamicTextureRT.deferredLight.release(); - // } void LLPipeline::releaseSunShadowTarget(U32 index) diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index ae6400842c..8dce63fe8e 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -721,9 +721,6 @@ public: // Auxillary render target pack scaled to the hero probe's per-face size. RenderTargetPack mHeroProbeRT; - // Auxillary render target pack for 1024px LLDynamicTexture - RenderTargetPack mDynamicTextureRT; - // currently used render target pack RenderTargetPack* mRT;