diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-30 12:19:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 12:19:38 -0600 |
| commit | a09b083b1b18d293d97dd84dd4849924b2766a4f (patch) | |
| tree | 6f0cbfd33d0cf125432ad0b8b93a2b052143ee14 /indra/newview/pipeline.cpp | |
| parent | 68875523e09f9fe06fc4b3cd5225995bb13966c3 (diff) | |
| parent | 88aefc95eace0bb8ea21cb44514d41d98bdf74cc (diff) | |
Merge branch 'DRTVWR-596' into davep/SL-20611
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7b1e5a55d1..76414b5e4e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -211,6 +211,7 @@ extern S32 gBoxFrame; extern BOOL gDisplaySwapBuffers; extern BOOL gDebugGL; extern BOOL gCubeSnapshot; +extern BOOL gSnapshotNoPost; bool gAvatarBacklight = false; @@ -6817,7 +6818,7 @@ void LLPipeline::gammaCorrect(LLRenderTarget* src, LLRenderTarget* dst) { { LL_PROFILE_GPU_ZONE("gamma correct"); - static LLCachedControl<bool> no_post(gSavedSettings, "RenderDisablePostProcessing", false); + static LLCachedControl<bool> buildNoPost(gSavedSettings, "RenderDisablePostProcessing", false); LLGLDepthTest depth(GL_FALSE, GL_FALSE); @@ -6827,7 +6828,8 @@ void LLPipeline::gammaCorrect(LLRenderTarget* src, LLRenderTarget* dst) { LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky(); - LLGLSLShader& shader = no_post && gFloaterTools->isAvailable() ? gNoPostGammaCorrectProgram : // no post (no gamma, no exposure, no tonemapping) + bool no_post = gSnapshotNoPost || (buildNoPost && gFloaterTools->isAvailable()); + LLGLSLShader& shader = no_post ? gNoPostGammaCorrectProgram : // no post (no gamma, no exposure, no tonemapping) psky->getReflectionProbeAmbiance(should_auto_adjust) == 0.f ? gLegacyPostGammaCorrectProgram : gDeferredPostGammaCorrectProgram; |