livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FIRE-34012: Add additional render target for 1024x dynamic texture bakes; might also fix FIRE-34016 happening on Intel GPUs" 

This reverts commit ecc4e93920.

# Conflicts:
#	indra/newview/pipeline.cpp
master
Ansariel 2024-09-17 17:17:55 +02:00
parent 0351cec50e
commit 7ba4a7a499
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldynamictexture.cpp
View File

@ -191,9 +191,7 @@ bool LLViewerDynamicTexture::updateAllInstances()
return true;
}
// <FS:Ansariel> 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())
{

16
indra/newview/pipeline.cpp
View File

@ -234,9 +234,7 @@ S32 LLPipeline::RenderHeroProbeUpdateRate;
S32 LLPipeline::RenderHeroProbeConservativeUpdateMultiplier;
LLTrace::EventStatHandle<S64> LLPipeline::sStatBatchSize("renderbatchsize");
// <FS:Ansariel> 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);
}
// <FS:Ansariel> Auxillary render target pack for 1024px LLDynamicTexture
mRT = &mDynamicTextureRT;
res = MAX_BAKE_WIDTH;
allocateScreenBufferInternal(res, res);
// </FS:Ansariel>
mRT = &mMainRT;
gCubeSnapshot = false;
}
@ -1296,12 +1288,6 @@ void LLPipeline::releaseScreenBuffers()
mHeroProbeRT.screen.release();
mHeroProbeRT.deferredScreen.release();
mHeroProbeRT.deferredLight.release();
// <FS:Ansariel> Auxillary render target pack for 1024px LLDynamicTexture
mDynamicTextureRT.screen.release();
mDynamicTextureRT.deferredScreen.release();
mDynamicTextureRT.deferredLight.release();
// </FS:Ansariel>
}
void LLPipeline::releaseSunShadowTarget(U32 index)

3
indra/newview/pipeline.h
View File

@ -721,9 +721,6 @@ public:
// Auxillary render target pack scaled to the hero probe's per-face size.
RenderTargetPack mHeroProbeRT;
// <FS:Ansariel> Auxillary render target pack for 1024px LLDynamicTexture
RenderTargetPack mDynamicTextureRT;
// currently used render target pack
RenderTargetPack* mRT;