godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #108015 from DarioSamo/vvl-errors

Browse Source 
Fix VVL errors by changing `frag_color` to FP32 and dFdx/y.
This commit is contained in:
Thaddeus Crews
2025-06-27 09:39:54 -05:00
parent 110eb1884c 4921a3e711
commit cef8eb1a65
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

@@ -967,7 +967,7 @@ layout(location = 0) out vec4 diffuse_buffer; //diffuse (rgb) and roughness
layout(location = 1) out vec4 specular_buffer; //specular and SSS (subsurface scatter) layout(location = 1) out vec4 specular_buffer; //specular and SSS (subsurface scatter)
#else #else
layout(location = 0) out hvec4 frag_color; layout(location = 0) out vec4 frag_color;
#endif // MODE_MULTIPLE_RENDER_TARGETS #endif // MODE_MULTIPLE_RENDER_TARGETS
#endif // RENDER DEPTH #endif // RENDER DEPTH
@@ -1481,9 +1481,11 @@ void main() {
#ifdef NORMAL_USED #ifdef NORMAL_USED
if (sc_scene_roughness_limiter_enabled()) { if (sc_scene_roughness_limiter_enabled()) {
//https://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf //https://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf
// SPIR-V Validation claims that derivatives of FP16 vectors are not valid code generation (see #108009).
vec3 dn = vec3(normal);
vec3 dndu = dFdx(dn), dndv = dFdy(dn);
half roughness2 = roughness * roughness; half roughness2 = roughness * roughness;
hvec3 dndu = dFdx(normal), dndv = dFdy(normal); half variance = half(scene_data.roughness_limiter_amount) * half(dot(dndu, dndu) + dot(dndv, dndv));
half variance = half(scene_data.roughness_limiter_amount) * (dot(dndu, dndu) + dot(dndv, dndv));
half kernelRoughness2 = min(half(2.0) * variance, half(scene_data.roughness_limiter_limit)); half kernelRoughness2 = min(half(2.0) * variance, half(scene_data.roughness_limiter_limit));
half filteredRoughness2 = min(half(1.0), roughness2 + kernelRoughness2); half filteredRoughness2 = min(half(1.0), roughness2 + kernelRoughness2);
roughness = sqrt(filteredRoughness2); roughness = sqrt(filteredRoughness2);
@@ -2182,23 +2184,25 @@ void main() {
#else //MODE_MULTIPLE_RENDER_TARGETS #else //MODE_MULTIPLE_RENDER_TARGETS
#ifdef MODE_UNSHADED #ifdef MODE_UNSHADED
frag_color = hvec4(albedo, alpha); hvec4 out_color = hvec4(albedo, alpha);
#else // MODE_UNSHADED #else // MODE_UNSHADED
frag_color = hvec4(emission + ambient_light + diffuse_light + direct_specular_light + indirect_specular_light, alpha); hvec4 out_color = hvec4(emission + ambient_light + diffuse_light + direct_specular_light + indirect_specular_light, alpha);
#endif // MODE_UNSHADED #endif // MODE_UNSHADED
#ifndef FOG_DISABLED #ifndef FOG_DISABLED
// Draw "fixed" fog before volumetric fog to ensure volumetric fog can appear in front of the sky. // Draw "fixed" fog before volumetric fog to ensure volumetric fog can appear in front of the sky.
frag_color.rgb = mix(frag_color.rgb, fog.rgb, fog.a); out_color.rgb = mix(out_color.rgb, fog.rgb, fog.a);
#endif // !FOG_DISABLED #endif // !FOG_DISABLED
// On mobile we use a UNORM buffer with 10bpp which results in a range from 0.0 - 1.0 resulting in HDR breaking // On mobile we use a UNORM buffer with 10bpp which results in a range from 0.0 - 1.0 resulting in HDR breaking
// We divide by sc_luminance_multiplier to support a range from 0.0 - 2.0 both increasing precision on bright and darker images // We divide by sc_luminance_multiplier to support a range from 0.0 - 2.0 both increasing precision on bright and darker images
frag_color.rgb = frag_color.rgb / sc_luminance_multiplier(); out_color.rgb = out_color.rgb / sc_luminance_multiplier();
#ifdef PREMUL_ALPHA_USED #ifdef PREMUL_ALPHA_USED
frag_color.rgb *= premul_alpha; out_color.rgb *= premul_alpha;
#endif #endif
frag_color = out_color;
#endif //MODE_MULTIPLE_RENDER_TARGETS #endif //MODE_MULTIPLE_RENDER_TARGETS
#endif //MODE_RENDER_DEPTH #endif //MODE_RENDER_DEPTH
@@ -2207,10 +2211,10 @@ void main() {
// These motion vectors are in NDC space (as opposed to screen space) to fit the OpenXR XR_FB_space_warp specification. // These motion vectors are in NDC space (as opposed to screen space) to fit the OpenXR XR_FB_space_warp specification.
// https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#XR_FB_space_warp // https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#XR_FB_space_warp
hvec3 ndc = hvec3(screen_position.xyz / screen_position.w); vec3 ndc = screen_position.xyz / screen_position.w;
ndc.y = -ndc.y; ndc.y = -ndc.y;
hvec3 prev_ndc = hvec3(prev_screen_position.xyz / prev_screen_position.w); vec3 prev_ndc = prev_screen_position.xyz / prev_screen_position.w;
prev_ndc.y = -prev_ndc.y; prev_ndc.y = -prev_ndc.y;
frag_color = hvec4(ndc - prev_ndc, half(0.0)); frag_color = vec4(ndc - prev_ndc, 0.0);
#endif #endif
} }