From 725d042640f5b0474b58e6a1af0a4063c7e5cfc2 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 26 Sep 2022 17:17:34 -0500 Subject: SL-18190 WIP - Windlight to linear space proof of concept, better parity between release viewer and materials viewer when reflections disabled. Avoid run-away probe ambiance. --- indra/newview/pipeline.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 26989a477a..325a370f43 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6235,22 +6235,6 @@ void LLPipeline::calcNearbyLights(LLCamera& camera) } } -void LLPipeline::adjustAmbient(const LLSettingsSky* sky, LLColor4& ambient) -{ - //bump ambient based on reflection probe ambiance of probes are disabled - // so sky settings that rely on probes for ambiance don't go completely dark - // on low end hardware - if (!LLPipeline::sReflectionProbesEnabled) - { - F32 ambiance = linearTosRGB(sky->getReflectionProbeAmbiance()); - - for (int i = 0; i < 3; ++i) - { - ambient.mV[i] = llmax(ambient.mV[i], ambiance); - } - } -} - void LLPipeline::setupHWLights(LLDrawPool* pool) { LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWPOOL; @@ -6261,8 +6245,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) // Ambient LLColor4 ambient = psky->getTotalAmbient(); - adjustAmbient(psky.get(), ambient); - + gGL.setAmbientLightColor(ambient); bool sun_up = environment.getIsSunUp(); -- cgit v1.3