feat(vulkan): activate gi post resolve execution path

Author: lmitchell137

engine-impl-vulkan/src/main/java/org/dynamislight/impl/vulkan/capability/VulkanGiCapabilityDescriptorV2.java

@@ -309,17 +309,37 @@ float giHash12(vec2 p) {
                         return fract((p3.x + p3.y) * p3.z);
                     }
                     vec4 resolveGiIndirect(vec4 baseColor, vec2 uv) {
+                        vec2 texel = 1.0 / vec2(textureSize(uSceneColor, 0));
+                        vec3 c0 = texture(uSceneColor, uv).rgb;
+                        vec3 c1 = texture(uSceneColor, clamp(uv + vec2(texel.x, 0.0), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 c2 = texture(uSceneColor, clamp(uv - vec2(texel.x, 0.0), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 c3 = texture(uSceneColor, clamp(uv + vec2(0.0, texel.y), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 c4 = texture(uSceneColor, clamp(uv - vec2(0.0, texel.y), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 probeInterp = (c0 * 0.40) + ((c1 + c2 + c3 + c4) * 0.15);
                         float probeBand = smoothstep(0.15, 0.85, giHash12(uv * 64.0));
-                        float probeContribution = mix(0.06, 0.16, probeBand);
-                        vec3 lifted = baseColor.rgb * (1.0 + probeContribution);
+                        float probeContribution = mix(0.05, 0.14, probeBand);
+                        vec3 lifted = mix(baseColor.rgb, probeInterp, 0.18 + probeContribution);
                         return vec4(clamp(lifted, vec3(0.0), vec3(1.0)), baseColor.a);
                     }
                     """;
             case "rtgi_single" -> """
                     vec4 resolveGiIndirect(vec4 baseColor, vec2 uv) {
+                        vec2 texel = 1.0 / vec2(textureSize(uSceneColor, 0));
+                        vec2 ray = normalize((uv - vec2(0.5)) + vec2(0.0001));
+                        vec3 rtAccum = vec3(0.0);
+                        float rtWeight = 0.0;
+                        for (int i = 0; i < 8; i++) {
+                            float t = (float(i) + 1.0) / 8.0;
+                            vec2 sampleUv = clamp(uv + ray * texel * (3.0 + t * 14.0), vec2(0.0), vec2(1.0));
+                            vec3 c = textureLod(uSceneColor, sampleUv, 0.6 + t * 1.4).rgb;
+                            float w = 1.0 - (t * 0.65);
+                            rtAccum += c * w;
+                            rtWeight += w;
+                        }
+                        vec3 rtColor = rtWeight > 0.0001 ? rtAccum / rtWeight : baseColor.rgb;
                         float centerWeight = 1.0 - clamp(length((uv - vec2(0.5)) * 1.6), 0.0, 1.0);
-                        float rtContribution = mix(0.08, 0.20, centerWeight);
-                        vec3 lifted = baseColor.rgb * (1.0 + rtContribution);
+                        float rtContribution = mix(0.08, 0.18, centerWeight);
+                        vec3 lifted = mix(baseColor.rgb, rtColor, 0.18 + rtContribution * 0.35);
                         return vec4(clamp(lifted, vec3(0.0), vec3(1.0)), baseColor.a);
                     }
                     """;
@@ -330,21 +350,36 @@ float giHash12(vec2 p) {
                         return fract((p3.x + p3.y) * p3.z);
                     }
                     vec4 resolveGiIndirect(vec4 baseColor, vec2 uv) {
+                        vec2 texel = 1.0 / vec2(textureSize(uSceneColor, 0));
+                        vec3 center = texture(uSceneColor, uv).rgb;
+                        vec3 neighX = texture(uSceneColor, clamp(uv + vec2(texel.x, 0.0), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 neighY = texture(uSceneColor, clamp(uv + vec2(0.0, texel.y), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 ssgiInterp = (center * 0.55) + ((neighX + neighY) * 0.225);
+                        vec2 ray = normalize((uv - vec2(0.5)) + vec2(0.0001));
+                        vec3 rtTap = textureLod(uSceneColor, clamp(uv + ray * texel * 9.0, vec2(0.0), vec2(1.0)), 1.2).rgb;
                         float probeBand = smoothstep(0.10, 0.90, giHash12(uv * 48.0));
                         float centerWeight = 1.0 - clamp(length((uv - vec2(0.5)) * 1.5), 0.0, 1.0);
                         float ssgiContribution = 0.07;
                         float probeContribution = mix(0.04, 0.10, probeBand);
                         float rtContribution = mix(0.03, 0.09, centerWeight);
                         float hybridContribution = ssgiContribution + probeContribution + rtContribution;
-                        vec3 lifted = baseColor.rgb * (1.0 + hybridContribution);
+                        vec3 hybrid = mix(ssgiInterp, rtTap, 0.35 + rtContribution);
+                        vec3 lifted = mix(baseColor.rgb, hybrid, 0.20 + hybridContribution * 0.45);
                         return vec4(clamp(lifted, vec3(0.0), vec3(1.0)), baseColor.a);
                     }
                     """;
             default -> """
                     vec4 resolveGiIndirect(vec4 baseColor, vec2 uv) {
+                        vec2 texel = 1.0 / vec2(textureSize(uSceneColor, 0));
+                        vec3 c = texture(uSceneColor, uv).rgb;
+                        vec3 cx = texture(uSceneColor, clamp(uv + vec2(texel.x, 0.0), vec2(0.0), vec2(1.0))).rgb;
+                        vec3 cy = texture(uSceneColor, clamp(uv + vec2(0.0, texel.y), vec2(0.0), vec2(1.0))).rgb;
+                        float depth = texture(uVelocityColor, uv).b;
                         float horizon = clamp(1.0 - abs(uv.y - 0.5) * 2.0, 0.0, 1.0);
-                        float ssgiContribution = mix(0.05, 0.14, horizon);
-                        vec3 lifted = baseColor.rgb * (1.0 + ssgiContribution);
+                        float depthAtten = clamp(1.0 - depth * 0.65, 0.15, 1.0);
+                        float ssgiContribution = mix(0.05, 0.14, horizon) * depthAtten;
+                        vec3 ssgiColor = (c * 0.6) + ((cx + cy) * 0.2);
+                        vec3 lifted = mix(baseColor.rgb, ssgiColor, 0.16 + ssgiContribution * 0.50);
                         return vec4(clamp(lifted, vec3(0.0), vec3(1.0)), baseColor.a);
                     }
                     """;

engine-impl-vulkan/src/main/java/org/dynamislight/impl/vulkan/shader/VulkanPostShaderSources.java

@@ -469,6 +469,9 @@ void main() {
                         centerMaterialReactive,
                         reflectionDisocclusionSignal
                     );
+                    vec4 giResolved = resolveGiIndirect(vec4(clamp(color, 0.0, 1.0), historyConfidenceOut), vUv);
+                    color = giResolved.rgb;
+                    historyConfidenceOut = clamp(max(historyConfidenceOut, giResolved.a), 0.0, 1.0);
                     outColor = vec4(clamp(color, 0.0, 1.0), historyConfidenceOut);
                 }
                 """;

engine-impl-vulkan/src/main/java/org/dynamislight/impl/vulkan/shader/VulkanShaderSources.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.dynamislight.impl.vulkan.capability.VulkanAaCapabilityDescriptorV2;
+import org.dynamislight.impl.vulkan.capability.VulkanGiCapabilityDescriptorV2;
 import org.dynamislight.impl.vulkan.capability.VulkanReflectionCapabilityDescriptorV2;
 import org.dynamislight.impl.vulkan.capability.VulkanShadowCapabilityDescriptorV2;
 import org.dynamislight.spi.render.RenderShaderModuleDeclaration;
@@ -88,6 +89,8 @@ private static List<RenderShaderModuleDeclaration> runtimePostModules() {
                 .shaderModules(VulkanReflectionCapabilityDescriptorV2.MODE_HYBRID));
         modules.addAll(VulkanAaCapabilityDescriptorV2.withMode(VulkanAaCapabilityDescriptorV2.MODE_TAA)
                 .shaderModules(VulkanAaCapabilityDescriptorV2.MODE_TAA));
+        modules.addAll(VulkanGiCapabilityDescriptorV2.withMode(VulkanGiCapabilityDescriptorV2.MODE_SSGI)
+                .shaderModules(VulkanGiCapabilityDescriptorV2.MODE_SSGI));
         return List.copyOf(modules);
     }
 }

engine-impl-vulkan/src/test/java/org/dynamislight/impl/vulkan/shader/VulkanShaderPhaseCParallelValidationTest.java

@@ -9,6 +9,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 import org.dynamislight.impl.vulkan.capability.VulkanAaCapabilityDescriptorV2;
+import org.dynamislight.impl.vulkan.capability.VulkanGiCapabilityDescriptorV2;
 import org.dynamislight.impl.vulkan.capability.VulkanReflectionCapabilityDescriptorV2;
 import org.dynamislight.impl.vulkan.capability.VulkanShadowCapabilityDescriptorV2;
 import org.dynamislight.spi.render.RenderFeatureMode;
@@ -65,10 +66,14 @@ private static List<RenderShaderModuleDeclaration> gatherModules(
                 VulkanReflectionCapabilityDescriptorV2.withMode(reflectionMode).shaderModules(reflectionMode);
         List<RenderShaderModuleDeclaration> aaModules =
                 VulkanAaCapabilityDescriptorV2.withMode(aaMode).shaderModules(aaMode);
+        List<RenderShaderModuleDeclaration> giModules =
+                VulkanGiCapabilityDescriptorV2.withMode(VulkanGiCapabilityDescriptorV2.MODE_SSGI)
+                        .shaderModules(VulkanGiCapabilityDescriptorV2.MODE_SSGI);
         java.util.ArrayList<RenderShaderModuleDeclaration> all = new java.util.ArrayList<>();
         all.addAll(shadowModules);
         all.addAll(reflectionModules);
         all.addAll(aaModules);
+        all.addAll(giModules);
         return List.copyOf(all);
     }
 

engine-impl-vulkan/src/test/java/org/dynamislight/impl/vulkan/shader/VulkanShaderSourcesTest.java

@@ -112,5 +112,8 @@ void postFragmentIncludesReflectionOverrideModes() {
         assertTrue(shader.contains("bool transparentCandidate = materialReactive >= 0.30;"));
         assertTrue(shader.contains("if (probeOnlyOverride) {"));
         assertTrue(shader.contains("int mode = reflectionOverrideMode == 2 ? 1 : (packedMode & 7);"));
+        assertTrue(shader.contains("vec4 resolveGiIndirect(vec4 baseColor, vec2 uv)"));
+        assertTrue(shader.contains("vec4 giResolved = resolveGiIndirect(vec4(clamp(color, 0.0, 1.0), historyConfidenceOut), vUv);"));
+        assertTrue(shader.contains("historyConfidenceOut = clamp(max(historyConfidenceOut, giResolved.a), 0.0, 1.0);"));
     }
 }

wish_list.md

@@ -220,6 +220,7 @@ GI notes:
 - GI phase-2A now has dedicated lockdown replay (`scripts/gi_phase2_ssgi_lockdown.sh`) and integration coverage for SSGI tier-default vs backend-override envelope/promotion thresholds.
 - GI phase-2A SSGI lockdown is now wired into CI as `gi-phase2-ssgi-lockdown` (plus workflow-dispatch toggle `run_gi_phase2_ssgi_lockdown`).
 - GI phase-2A now includes GI shader-module realization in composition (`resolveGiIndirect`) with mode-specific module declarations + descriptor-aligned bindings for `ssgi`, `probe_grid`, `rtgi_single`, and `hybrid_probe_ssgi_rt`.
+- GI post-composite execution now applies `resolveGiIndirect` in-frame after reflections, with mode-specific spatial sampling (SSGI neighborhood/depth attenuation, probe-grid interpolation, RT-detail ray taps, hybrid blend) using live scene inputs.
 - GI runtime now emits probe-grid policy/envelope/promotion telemetry (`GI_PROBE_GRID_POLICY_ACTIVE`, `GI_PROBE_GRID_ENVELOPE`, `GI_PROBE_GRID_ENVELOPE_BREACH`, `GI_PROBE_GRID_PROMOTION_READY`) with tier-default/override thresholds.
 - Typed GI promotion diagnostics now expose probe-grid expected/active ratio, cooldown/streak envelope state, and probe-grid promotion readiness for parser-free CI assertions.
 - GI runtime now emits probe-grid streaming/update cadence telemetry (`GI_PROBE_GRID_STREAMING_POLICY_ACTIVE`, `GI_PROBE_GRID_STREAMING_ENVELOPE`, `GI_PROBE_GRID_STREAMING_ENVELOPE_BREACH`) with configurable coverage/streak/cooldown thresholds and typed diagnostics fields (`probeGridConfiguredCount`, `probeGridActiveCount`, `probeGridUpdateBudgetPerFrame`, `probeGridUpdatesLastFrame`, `probeGridUpdateCoverageRatio`).