improvements to lighting model

2026-02-19 23:20:54 +02:00 · 2026-02-19 23:20:54 +02:00 · ddc892c13c
commit ddc892c13c
parent afcafce59c
3 changed files with 4301 additions and 2681 deletions
--- a/log_nvprosample.txt
+++ b/log_nvprosample.txt
@ -0,0 +1,172 @@
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+____________________
+Devices : 1
+0: AMD Radeon RX 6950 XT
+  - Compatible 
+Compatible physical devices found : 1
+Using Device:
+ - Device Name    : AMD Radeon RX 6950 XT
+ - Vendor         : AMD
+ - Driver Version : 2.0.341
+ - API Version    : 1.4.308
+ - Device Type    : Discrete GPU
+________________________
+Used Device Extensions :
+VK_KHR_deferred_host_operations
+VK_KHR_acceleration_structure
+VK_KHR_ray_query
+
+BLAS Compaction: 0.7MB -> 0.2MB (0.4MB saved, 66.0% smaller)
+_______________
+Vulkan Version:
+ - available:  1.4.309
+ - requesting: 1.3.0
+______________________
+Used Instance Layers :
+VK_LAYER_KHRONOS_validation
+
+Used Instance Extensions :
+__________________
--- a/src/shaders/jai/shader_trile.jai
+++ b/src/shaders/jai/shader_trile.jai
--- a/src/shaders/shader_trile.glsl
+++ b/src/shaders/shader_trile.glsl
@ -496,39 +496,34 @@ void main() {
    float shadowp = texture(sampler2DShadow(shadowtex, shadowsmp), light_pos);

    // Direct lighting
-    // vec3 light = shadowp * (kD * albedo / PI + specular) * NdotL * sunLightColor * sunIntensity;
-    vec3 light = vec3(0.0);
+    vec3 light = shadowp * (kD * albedo / PI + specular) * NdotL * sunLightColor * sunIntensity;

    // RDM indirect lighting
-    // vec3 trileCenter = floor(vpos - ipos) + vec3(0.5);
    vec3 hemispherePos = trileCenter + N * 0.49;
    ivec3 local = ivec3(mod(floor(trileCenter), 32.0));
    vec4 atlas_rect_check = rdm_get_atlas_rect(local, roughnessInt);
+    float ssao_sample = texture(sampler2D(ssaotex, trilesmp), vec2(gl_FragCoord.x / float(screen_w), gl_FragCoord.y / float(screen_h)), 0).r;

-    if (true) {
+    if (atlas_rect_check.z > 0.0) {
+        vec3 Frough = FresnelSchlickRoughness(max(dot(N, V), 0.0), F0, roughness);
+
+        // Indirect specular
        vec3 indirectSpec = sample_rdm(N, -cv,
            hemispherePos, vpos - hemispherePos, roughnessInt, local);
-        vec3 Frough = FresnelSchlickRoughness(max(dot(N, V), 0.0), F0, roughness);
        vec2 envBRDF = texture(sampler2D(brdf_lut, rdmsmp), vec2(max(dot(N, V), 0.0), roughness)).rg;
-        // light += indirectSpec * (Frough * envBRDF.x + envBRDF.y);
-        light += indirectSpec;
+        light += indirectSpec * (Frough * envBRDF.x + envBRDF.y);

        // Indirect diffuse (interpolated from neighbor probes)
        vec3 indirectDiff = sample_rdm_diff(N, vpos - hemispherePos, local);
-        vec3 kS = fresnelSchlick(max(dot(N, V), 0.0), F0);
        vec3 kDiff = 1.0 - Frough;
        kDiff *= 1.0 - metallic;
-        float ssao_sample = texture(sampler2D(ssaotex, trilesmp), vec2(gl_FragCoord.x / float(screen_w), gl_FragCoord.y / float(screen_h)), 0).r;
-        // light += (kDiff * indirectDiff / PI * albedo) * ssao_sample;
-        // light += indirectDiff * albedo;
+        light += (kDiff * indirectDiff / PI * albedo) * ssao_sample;
    } else {
-        float ssao_sample = texture(sampler2D(ssaotex, trilesmp), vec2(gl_FragCoord.x / float(screen_w), gl_FragCoord.y / float(screen_h)), 0).r;
        // Fallback: ambient + sky reflection when no RDM data
        light += 0.35 * albedo * ssao_sample;
        vec3 R = reflect(-V, N);
        if (R.y < 0.0) R = reflect(R, vec3(0.0, 1.0, 0.0));
        light += F * sky(R, sunPosition) * 0.1;
-        
    }

    frag_color = vec4(mix(deepColor, light, smoothstep(0.0, planeHeight, vpos.y)), 1.0);