SSR cone-mip contact hardening

Geenz · Geenz · commit 9ceacd3e4ac7 · 2026-04-08T14:06:48.000-04:00
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
@@ -866,6 +866,17 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList()
         validation.push_back(Validator(SETTING_AMBIENT_SKY_SATURATION, false, LLSD::TypeReal,
             boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.0f, 1.0f))));
 
+        validation.push_back(Validator(SETTING_SKY_VERSION,           false, LLSD::TypeInteger,
+            boost::bind(&Validator::verifyIntegerRange, _1, _2, llsd::array(0, (S32)MAX_SKY_SETTINGS_VERSION))));
+        validation.push_back(Validator(SETTING_SUN_BRIGHTNESS,        false, LLSD::TypeReal));
+        validation.push_back(Validator(SETTING_HDR_OFFSET,            false, LLSD::TypeReal));
+        validation.push_back(Validator(SETTING_HDR_MAX,               false, LLSD::TypeReal));
+        validation.push_back(Validator(SETTING_HDR_MIN,               false, LLSD::TypeReal));
+        validation.push_back(Validator(SETTING_HDR_TONEMAPPER,        false, LLSD::TypeInteger,
+            boost::bind(&Validator::verifyIntegerRange, _1, _2, llsd::array(0, 1))));
+        validation.push_back(Validator(SETTING_HDR_TONEMAPPER_AMOUNT, false, LLSD::TypeReal,
+            boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.0f, 1.0f))));
+
         validation.push_back(Validator(SETTING_RAYLEIGH_CONFIG, true, LLSD::TypeArray, &validateRayleighLayers));
         validation.push_back(Validator(SETTING_ABSORPTION_CONFIG, true, LLSD::TypeArray, &validateAbsorptionLayers));
         validation.push_back(Validator(SETTING_MIE_CONFIG, true, LLSD::TypeArray, &validateMieLayers));
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
@@ -1321,6 +1321,7 @@ void LLShaderMgr::initAttribsAndUniforms()
     mReservedUniforms.push_back("environmentMap");
     mReservedUniforms.push_back("sceneMap");
     mReservedUniforms.push_back("sceneDepth");
+    mReservedUniforms.push_back("ssrConeMipMap");
     mReservedUniforms.push_back("reflectionProbes");
     mReservedUniforms.push_back("irradianceProbes");
     mReservedUniforms.push_back("heroProbes");
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
@@ -112,6 +112,7 @@ class LLShaderMgr
         ENVIRONMENT_MAP,                    //  "environmentMap"
         SCENE_MAP,                          //  "sceneMap"
         SCENE_DEPTH,                        //  "sceneDepth"
+        SSR_CONE_MIP_MAP,                   //  "ssrConeMipMap"
         REFLECTION_PROBES,                  //  "reflectionProbes"
         IRRADIANCE_PROBES,                  //  "irradianceProbes"
         HERO_PROBE,                         //  "heroProbes"
diff --git a/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl
@@ -30,8 +30,9 @@ float random (vec2 uv)
     return 0.f;
 }
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness)
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness)
 {
     collectedColor = vec4(0);
+    coneMipOut = 0.0;
     return 0.f;
 }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -36,8 +36,9 @@ uniform float max_probe_lod;
 uniform bool transparent_surface;
 
 uniform float ssrMipScale;
+uniform sampler2D ssrConeMipMap;
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);
 
 uniform int classic_mode;
 
@@ -822,11 +823,16 @@ void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,
 
             if (transparent)
             {
-                tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, sceneMap, glossiness);
+                float unusedMip;
+                tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, unusedMip, sceneMap, glossiness);
             }
             else
             {
-                ssr = textureLod(sceneMap, tc, roughness * ssrMipScale);
+                // Contact hardening: read cone mip from MRT1 for LOD selection,
+                // sample color+confidence from MRT0 mip chain.
+                float coneMip = texture(ssrConeMipMap, tc).r * ssrMipScale;
+                float ssrLod = clamp(coneMip, 0.0, ssrMipScale);
+                ssr = textureLod(sceneMap, tc, ssrLod);
             }
 
             if (ssr.a > 0.001)
@@ -953,11 +959,14 @@ void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout
 
             if (transparent)
             {
-                tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, sceneMap, glossiness);
+                float unusedMip;
+                tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, unusedMip, sceneMap, glossiness);
             }
             else
             {
-                float ssrLod = clamp(log2(1.0 + roughness * roughness * ssrMipScale * 4.0), 0.0, ssrMipScale);
+                // Contact hardening: read cone mip from MRT1, sample color from MRT0.
+                float coneMip = texture(ssrConeMipMap, tc).r * ssrMipScale;
+                float ssrLod = clamp(coneMip, 0.0, ssrMipScale);
                 ssr = textureLod(sceneMap, tc, ssrLod);
             }
 
diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflAlphaF.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflAlphaF.glsl
@@ -25,7 +25,8 @@
 
 /*[EXTRA_CODE_HERE]*/
 
-out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
+layout(location = 1) out float frag_cone_mip;
 
 in vec3 vary_position;
 in vec3 vary_normal;
@@ -41,7 +42,7 @@ uniform mat4 projection_matrix;
 uniform float roughnessFactor;
 uniform float minimum_alpha;
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);
 void bayerDitherDiscard(float alpha, float threshold);
 
 void main()
@@ -66,7 +67,9 @@ void main()
     vec3 norm = normalize(vary_normal);
 
     vec4 ssrColor = vec4(0.0);
-    tapScreenSpaceReflection(1, tc, vary_position, norm, ssrColor, sceneMap, glossiness);
+    float coneMip = 0.0;
+    tapScreenSpaceReflection(1, tc, vary_position, norm, ssrColor, coneMip, sceneMap, glossiness);
     frag_color = ssrColor;
     frag_color.a *= alpha;
+    frag_cone_mip = coneMip;
 }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflPostF.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflPostF.glsl
@@ -48,7 +48,7 @@ vec4 getPosition(vec2 pos_screen);
 
 float random (vec2 uv);
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);
 
 void main()
 {
@@ -68,8 +68,9 @@ void main()
     }
 
     vec4 collectedColor = vec4(0);
+    float coneMip = 0.0;
 
-    float w = tapScreenSpaceReflection(4, tc, pos, gb.normal, collectedColor, diffuseMap, 0.f);
+    float w = tapScreenSpaceReflection(4, tc, pos, gb.normal, collectedColor, coneMip, diffuseMap, 0.f);
 
     collectedColor.rgb *= specCol.rgb;
 
diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflTraceF.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflTraceF.glsl
@@ -25,7 +25,8 @@
 
 /*[EXTRA_CODE_HERE]*/
 
-out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
+layout(location = 1) out float frag_cone_mip;
 
 in vec2 vary_fragcoord;
 in vec3 camera_ray;
@@ -36,7 +37,7 @@ GBufferInfo getGBuffer(vec2 screenpos);
 float getDepth(vec2 pos_screen);
 vec4 getPositionWithDepth(vec2 pos_screen, float depth);
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);
 
 void main()
 {
@@ -47,6 +48,7 @@ void main()
     if (depth >= 1.0)
     {
         frag_color = vec4(0.0);
+        frag_cone_mip = 0.0;
         return;
     }
 
@@ -60,6 +62,8 @@ void main()
         glossiness = gb.specular.a;          // Legacy: a = glossiness
 
     vec4 ssrColor = vec4(0.0);
-    tapScreenSpaceReflection(1, tc, pos, gb.normal, ssrColor, sceneMap, glossiness);
+    float coneMip = 0.0;
+    tapScreenSpaceReflection(1, tc, pos, gb.normal, ssrColor, coneMip, sceneMap, glossiness);
     frag_color = ssrColor;
+    frag_cone_mip = coneMip;
 }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl
@@ -43,6 +43,7 @@ uniform float maxZDepth;
 uniform float maxRoughness;
 uniform vec2 ssrJitterOffset;
 uniform int hizMipCount;
+uniform float ssrMipScale;
 
 vec4 getPositionWithDepth(vec2 pos_screen, float depth);
 
@@ -225,9 +226,11 @@ float tapScreenSpaceReflection(
     vec3 viewPos,
     vec3 n,
     inout vec4 collectedColor,
+    out float coneMipOut,
     sampler2D source,
     float glossiness)
 {
+    coneMipOut = 0.0;
     float roughness = 1.0 - glossiness;
 
     if (roughness >= maxRoughness)
@@ -271,6 +274,7 @@ float tapScreenSpaceReflection(
     int numSamples = max(1, int(glossySampleCount));
     vec3 accumColor = vec3(0.0);
     float accumFade = 0.0;
+    float accumConeMip = 0.0;
     int hits = 0;
 
     for (int s = 0; s < numSamples; s++)
@@ -398,7 +402,24 @@ float tapScreenSpaceReflection(
 
         float sampleFade = edgeFade * zFade * fadeIn * rayFade * confidence * cameraFacingFade;
 
+        // Contact hardening (Godot cone model):
+        // The roughness defines a reflection cone half-angle. The cone footprint
+        // on screen grows with ray travel distance. Fit an inscribed sphere in
+        // the cone to derive a blur radius, then convert to a mip level.
+        float coneAngle = min(roughness, 0.999) * 3.14159265 * 0.5;
+        float coneLen = rayLen * max(screen_res.x, screen_res.y); // UV → pixels
+        float opLen = 2.0 * tan(coneAngle) * coneLen;
+        float blurRadius = 0.0;
+        if (coneLen > 0.0)
+        {
+            float a2 = opLen * opLen;
+            float fh2 = 4.0 * coneLen * coneLen;
+            blurRadius = (opLen * (sqrt(a2 + fh2) - opLen)) / (4.0 * coneLen);
+        }
+        float coneMip = log2(blurRadius / 16.0 + 1.0);
+
         accumColor += sampledColor.rgb * sampleFade;
+        accumConeMip += coneMip * sampleFade;
         accumFade += sampleFade;
         hits++;
     }
@@ -410,10 +431,17 @@ float tapScreenSpaceReflection(
     }
 
     accumColor /= float(numSamples);
+    accumConeMip /= float(numSamples);
     accumFade /= float(numSamples);
 
     float combinedFade = accumFade * baseEdgeFade;
 
+    // Cone mip: weighted average, normalized to [0,1] for storage in MRT1.
+    float avgConeMip = (accumFade > 0.001) ? accumConeMip / accumFade : 0.0;
+    coneMipOut = clamp(avgConeMip / max(ssrMipScale, 1.0), 0.0, 1.0);
+
+    // RGB: color premultiplied by confidence (for correct mip chain filtering).
+    // A:   confidence (restored — used for premultiply recovery + occlusion blending).
     collectedColor = vec4(accumColor * baseEdgeFade, combinedFade);
     return 1.0;
 }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflWaterF.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflWaterF.glsl
@@ -25,7 +25,8 @@
 
 /*[EXTRA_CODE_HERE]*/
 
-out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
+layout(location = 1) out float frag_cone_mip;
 
 uniform sampler2D bumpMap;
 uniform sampler2D bumpMap2;
@@ -42,7 +43,7 @@ in vec3 vary_position;
 in vec3 vary_normal;
 in vec3 vary_tangent;
 
-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);
+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);
 
 uniform sampler2D sceneMap;
 
@@ -92,6 +93,8 @@ void main()
     vec2 tc = (projPos.xy / projPos.w) * 0.5 + 0.5;
 
     vec4 ssrColor = vec4(0.0);
-    tapScreenSpaceReflection(1, tc, vary_position, wave_ibl, ssrColor, sceneMap, glossiness);
+    float coneMip = 0.0;
+    tapScreenSpaceReflection(1, tc, vary_position, wave_ibl, ssrColor, coneMip, sceneMap, glossiness);
     frag_color = ssrColor;
+    frag_cone_mip = coneMip;
 }
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
@@ -924,6 +924,7 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY)
             // At full res: no own depth, share from deferred (zero-copy).
             // At reduced res: allocate own depth, blit from deferred before alpha/water passes.
             mSSRBuffer.allocate(ssrW, ssrH, GL_RGBA16F, !fullRes, LLTexUnit::TT_TEXTURE, LLTexUnit::TMG_AUTO);
+            mSSRBuffer.addColorAttachment(GL_R16F); // MRT1: cone mip for contact hardening
 
             // Allocate per-mip temp targets for Gaussian ping-pong (one per mip level > 0)
             U32 ssrMipLevels = mSSRBuffer.getMipLevels();
@@ -9962,6 +9963,14 @@ void LLPipeline::bindReflectionProbes(LLGLSLShader& shader)
                 // Pass mip scale for roughness -> mip level mapping
                 static LLStaticHashedString sSsrMipScale("ssrMipScale");
                 shader.uniform1f(sSsrMipScale, (float)(mSSRBuffer.getMipLevels() - 1));
+
+                // Bind cone mip texture (MRT1) for contact hardening LOD selection
+                S32 coneMipChannel = shader.enableTexture(LLShaderMgr::SSR_CONE_MIP_MAP);
+                if (coneMipChannel > -1)
+                {
+                    gGL.getTexUnit(coneMipChannel)->bindManual(LLTexUnit::TT_TEXTURE, mSSRBuffer.getTexture(1));
+                    gGL.getTexUnit(coneMipChannel)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
+                }
             }
             else
             {
@@ -10005,6 +10014,10 @@ void LLPipeline::bindReflectionProbes(LLGLSLShader& shader)
             shader.uniform1f(LLShaderMgr::DEFERRED_SSR_MAX_Z, traceMaxDepth());
             shader.uniform1f(LLShaderMgr::DEFERRED_SSR_MAX_ROUGHNESS, traceMaxRoughness());
 
+            // Pass SSR buffer mip count so the trace can compute cone-based mip levels
+            static LLStaticHashedString sSsrMipScale("ssrMipScale");
+            shader.uniform1f(sSsrMipScale, mSSRBuffer.isComplete() ? (float)(mSSRBuffer.getMipLevels() - 1) : 0.f);
+
             // Compute jitter compensation for SMAA T2x.
             // mSceneMap was rendered with the previous frame's jittered projection.
             // SSR projects positions using the current frame's projection.

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,9 @@ float random (vec2 uv)`
`30`	`30`	`return 0.f;`
`31`	`31`	`}`
`32`	`32`
`33`		`-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness)`
	`33`	`+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness)`
`34`	`34`	`{`
`35`	`35`	`collectedColor = vec4(0);`
	`36`	`+ coneMipOut = 0.0;`
`36`	`37`	`return 0.f;`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ uniform float max_probe_lod;`
`36`	`36`	`uniform bool transparent_surface;`
`37`	`37`
`38`	`38`	`uniform float ssrMipScale;`
	`39`	`+uniform sampler2D ssrConeMipMap;`
`39`	`40`
`40`		`-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);`
	`41`	`+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);`
`41`	`42`
`42`	`43`	`uniform int classic_mode;`
`43`	`44`
`@@ -822,11 +823,16 @@ void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,`
`822`	`823`
`823`	`824`	`if (transparent)`
`824`	`825`	`{`
`825`		`- tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, sceneMap, glossiness);`
	`826`	`+ float unusedMip;`
	`827`	`+ tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, unusedMip, sceneMap, glossiness);`
`826`	`828`	`}`
`827`	`829`	`else`
`828`	`830`	`{`
`829`		`- ssr = textureLod(sceneMap, tc, roughness * ssrMipScale);`
	`831`	`+ // Contact hardening: read cone mip from MRT1 for LOD selection,`
	`832`	`+ // sample color+confidence from MRT0 mip chain.`
	`833`	`+ float coneMip = texture(ssrConeMipMap, tc).r * ssrMipScale;`
	`834`	`+ float ssrLod = clamp(coneMip, 0.0, ssrMipScale);`
	`835`	`+ ssr = textureLod(sceneMap, tc, ssrLod);`
`830`	`836`	`}`
`831`	`837`
`832`	`838`	`if (ssr.a > 0.001)`
`@@ -953,11 +959,14 @@ void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout`
`953`	`959`
`954`	`960`	`if (transparent)`
`955`	`961`	`{`
`956`		`- tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, sceneMap, glossiness);`
	`962`	`+ float unusedMip;`
	`963`	`+ tapScreenSpaceReflection(1, tc, pos.xyz, norm, ssr, unusedMip, sceneMap, glossiness);`
`957`	`964`	`}`
`958`	`965`	`else`
`959`	`966`	`{`
`960`		`- float ssrLod = clamp(log2(1.0 + roughness * roughness * ssrMipScale * 4.0), 0.0, ssrMipScale);`
	`967`	`+ // Contact hardening: read cone mip from MRT1, sample color from MRT0.`
	`968`	`+ float coneMip = texture(ssrConeMipMap, tc).r * ssrMipScale;`
	`969`	`+ float ssrLod = clamp(coneMip, 0.0, ssrMipScale);`
`961`	`970`	`ssr = textureLod(sceneMap, tc, ssrLod);`
`962`	`971`	`}`
`963`	`972`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ vec4 getPosition(vec2 pos_screen);`
`48`	`48`
`49`	`49`	`float random (vec2 uv);`
`50`	`50`
`51`		`-float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness);`
	`51`	`+float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, out float coneMipOut, sampler2D source, float glossiness);`
`52`	`52`
`53`	`53`	`void main()`
`54`	`54`	`{`
`@@ -68,8 +68,9 @@ void main()`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`vec4 collectedColor = vec4(0);`
	`71`	`+ float coneMip = 0.0;`
`71`	`72`
`72`		`- float w = tapScreenSpaceReflection(4, tc, pos, gb.normal, collectedColor, diffuseMap, 0.f);`
	`73`	`+ float w = tapScreenSpaceReflection(4, tc, pos, gb.normal, collectedColor, coneMip, diffuseMap, 0.f);`
`73`	`74`
`74`	`75`	`collectedColor.rgb *= specCol.rgb;`
`75`	`76`