diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/pipeline.cpp | 8 | ||||
-rw-r--r-- | indra/newview/pipeline.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 46d9c07828..eaf54356a2 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -213,7 +213,6 @@ S32 LLPipeline::RenderBufferVisualization; bool LLPipeline::RenderMirrors; S32 LLPipeline::RenderHeroProbeUpdateRate; S32 LLPipeline::RenderHeroProbeConservativeUpdateMultiplier; -F32 LLPipeline::RenderCASSharpness; LLTrace::EventStatHandle<S64> LLPipeline::sStatBatchSize("renderbatchsize"); const U32 LLPipeline::MAX_BAKE_WIDTH = 512; @@ -576,7 +575,6 @@ void LLPipeline::init() connectRefreshCachedSettingsSafe("RenderMirrors"); connectRefreshCachedSettingsSafe("RenderHeroProbeUpdateRate"); connectRefreshCachedSettingsSafe("RenderHeroProbeConservativeUpdateMultiplier"); - connectRefreshCachedSettingsSafe("RenderCASSharpness"); gSavedSettings.getControl("RenderAutoHideSurfaceAreaLimit")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings)); } @@ -1094,7 +1092,6 @@ void LLPipeline::refreshCachedSettings() RenderMirrors = gSavedSettings.getBOOL("RenderMirrors"); RenderHeroProbeUpdateRate = gSavedSettings.getS32("RenderHeroProbeUpdateRate"); RenderHeroProbeConservativeUpdateMultiplier = gSavedSettings.getS32("RenderHeroProbeConservativeUpdateMultiplier"); - RenderCASSharpness = gSavedSettings.getF32("RenderCASSharpness"); sReflectionProbesEnabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderReflectionsEnabled") && gSavedSettings.getBOOL("RenderReflectionsEnabled"); RenderSpotLight = nullptr; @@ -7149,7 +7146,8 @@ void LLPipeline::generateGlow(LLRenderTarget* src) void LLPipeline::applyCAS(LLRenderTarget* src, LLRenderTarget* dst) { - if (RenderCASSharpness == 0.0) + static LLCachedControl<F32> cas_sharpness(gSavedSettings, "RenderCASSharpness", 0.4f); + if (cas_sharpness == 0.0f) { gPipeline.copyRenderTarget(src, dst); return; @@ -7170,7 +7168,7 @@ void LLPipeline::applyCAS(LLRenderTarget* src, LLRenderTarget* dst) varAU4(const0); varAU4(const1); CasSetup(const0, const1, - RenderCASSharpness, // Sharpness tuning knob (0.0 to 1.0). + cas_sharpness(), // Sharpness tuning knob (0.0 to 1.0). (AF1)src->getWidth(), (AF1)src->getHeight(), // Input size. (AF1)dst->getWidth(), (AF1)dst->getHeight()); // Output size. diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index a58b7850ea..1c87b71d06 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -1068,7 +1068,6 @@ public: static bool RenderMirrors; static S32 RenderHeroProbeUpdateRate; static S32 RenderHeroProbeConservativeUpdateMultiplier; - static F32 RenderCASSharpness; }; void render_bbox(const LLVector3 &min, const LLVector3 &max); |