Merge pull request godotengine#118695 from shiena/fix/webgl-angle-shader-compilation

Repiteo · Repiteo · commit caf16709af9f · 2026-04-18T07:28:38.000-05:00
Fix GLES3 scene shader int literal type errors for WebGL
diff --git a/drivers/gles3/shaders/area_lights_inc.glsl b/drivers/gles3/shaders/area_lights_inc.glsl
@@ -8,7 +8,7 @@ float acos_approx(float p_x) {
 	float x = abs(p_x);
 	float res = -0.156583f * x + (M_PI / 2.0);
 	res *= sqrt(1.0f - x);
-	return (p_x >= 0) ? res : M_PI - res;
+	return (p_x >= 0.0) ? res : M_PI - res;
 }
 
 vec3 integrate_edge_hill(vec3 p0, vec3 p1) {
diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl
@@ -1797,7 +1797,7 @@ void light_process_area(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 f
 	if (dot(area_width, area_width) < EPSILON || dot(area_height, area_height) < EPSILON) { // area is 0
 		return;
 	}
-	if (dot(area_direction, vertex - area_lights[idx].position) <= 0) {
+	if (dot(area_direction, vertex - area_lights[idx].position) <= 0.0) {
 		return; // vertex is behind light
 	}
 
@@ -1829,7 +1829,7 @@ void light_process_area(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 f
 	float f90 = clamp(dot(f0, vec3(50.0 * 0.33)), metallic, 1.0);
 	vec3 fresnel_color = f0 * max(ltc_fresnel.x, 0.0) + (f90 - f0) * max(ltc_fresnel.y, 0.0);
 
-	float light_length = max(0, dist);
+	float light_length = max(0.0, dist);
 	float light_attenuation_raw = get_omni_spot_attenuation(light_length, area_lights[idx].inv_radius, area_lights[idx].attenuation);
 	float light_attenuation_ltc = light_attenuation_raw * light_length * light_length; // solid angle already decreases by inverse square, so attenuation power is 2.0 by default -> subtract 2.0
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ float acos_approx(float p_x) {`
`8`	`8`	`float x = abs(p_x);`
`9`	`9`	`float res = -0.156583f * x + (M_PI / 2.0);`
`10`	`10`	`res *= sqrt(1.0f - x);`
`11`		`- return (p_x >= 0) ? res : M_PI - res;`
	`11`	`+ return (p_x >= 0.0) ? res : M_PI - res;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`vec3 integrate_edge_hill(vec3 p0, vec3 p1) {`
Original file line number	Diff line number	Diff line change
`@@ -1797,7 +1797,7 @@ void light_process_area(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 f`
`1797`	`1797`	`if (dot(area_width, area_width) < EPSILON \|\| dot(area_height, area_height) < EPSILON) { // area is 0`
`1798`	`1798`	`return;`
`1799`	`1799`	`}`
`1800`		`- if (dot(area_direction, vertex - area_lights[idx].position) <= 0) {`
	`1800`	`+ if (dot(area_direction, vertex - area_lights[idx].position) <= 0.0) {`
`1801`	`1801`	`return; // vertex is behind light`
`1802`	`1802`	`}`
`1803`	`1803`
`@@ -1829,7 +1829,7 @@ void light_process_area(uint idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 f`
`1829`	`1829`	`float f90 = clamp(dot(f0, vec3(50.0 * 0.33)), metallic, 1.0);`
`1830`	`1830`	`vec3 fresnel_color = f0 * max(ltc_fresnel.x, 0.0) + (f90 - f0) * max(ltc_fresnel.y, 0.0);`
`1831`	`1831`
`1832`		`- float light_length = max(0, dist);`
	`1832`	`+ float light_length = max(0.0, dist);`
`1833`	`1833`	`float light_attenuation_raw = get_omni_spot_attenuation(light_length, area_lights[idx].inv_radius, area_lights[idx].attenuation);`
`1834`	`1834`	`float light_attenuation_ltc = light_attenuation_raw * light_length * light_length; // solid angle already decreases by inverse square, so attenuation power is 2.0 by default -> subtract 2.0`
`1835`	`1835`