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

Fix shader crash on using METALLIC and ROUGHNESS built-ins in light func

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-10-11 12:53:49 +03:00
parent cd3c1f2594
commit db2ee03fff
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
View File

@@ -97,6 +97,11 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
#endif #endif
inout vec3 diffuse_light, inout vec3 specular_light) { inout vec3 diffuse_light, inout vec3 specular_light) {
vec4 orms_unpacked = unpackUnorm4x8(orms);
float roughness = orms_unpacked.y;
float metallic = orms_unpacked.z;
#if defined(LIGHT_CODE_USED) #if defined(LIGHT_CODE_USED)
// light is written by the light shader // light is written by the light shader
@@ -125,9 +130,7 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
float cLdotH = clamp(A + dot(L, H), 0.0, 1.0); float cLdotH = clamp(A + dot(L, H), 0.0, 1.0);
#endif #endif
float metallic = unpackUnorm4x8(orms).z;
if (metallic < 1.0) { if (metallic < 1.0) {
float roughness = unpackUnorm4x8(orms).y;
float diffuse_brdf_NL; // BRDF times N.L for calculating diffuse radiance float diffuse_brdf_NL; // BRDF times N.L for calculating diffuse radiance
#if defined(DIFFUSE_LAMBERT_WRAP) #if defined(DIFFUSE_LAMBERT_WRAP)
@@ -199,7 +202,6 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
#endif //LIGHT_TRANSMITTANCE_USED #endif //LIGHT_TRANSMITTANCE_USED
} }
float roughness = unpackUnorm4x8(orms).y;
if (roughness > 0.0) { // FIXME: roughness == 0 should not disable specular light entirely if (roughness > 0.0) { // FIXME: roughness == 0 should not disable specular light entirely
// D // D
@@ -211,7 +213,7 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
float blinn = pow(cNdotH, shininess); float blinn = pow(cNdotH, shininess);
blinn *= (shininess + 2.0) * (1.0 / (8.0 * M_PI)); blinn *= (shininess + 2.0) * (1.0 / (8.0 * M_PI));
specular_light += light_color * attenuation * specular_amount * blinn * f0 * unpackUnorm4x8(orms).w; specular_light += light_color * attenuation * specular_amount * blinn * f0 * orms_unpacked.w;
#elif defined(SPECULAR_PHONG) #elif defined(SPECULAR_PHONG)
@@ -221,7 +223,7 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
float phong = pow(cRdotV, shininess); float phong = pow(cRdotV, shininess);
phong *= (shininess + 1.0) * (1.0 / (8.0 * M_PI)); phong *= (shininess + 1.0) * (1.0 / (8.0 * M_PI));
specular_light += light_color * attenuation * specular_amount * phong * f0 * unpackUnorm4x8(orms).w; specular_light += light_color * attenuation * specular_amount * phong * f0 * orms_unpacked.w;
#elif defined(SPECULAR_TOON) #elif defined(SPECULAR_TOON)