Fix SSR

* Was broken at some point long time ago, this restores it.

2 files changed, 10 insertions, 8 deletions

diff --git a/servers/rendering/renderer_rd/effects_rd.cpp b/servers/rendering/renderer_rd/effects_rd.cpp
index 4290e0d574..b0a1a2c939 100644
--- a/servers/rendering/renderer_rd/effects_rd.cpp
+++ b/servers/rendering/renderer_rd/effects_rd.cpp
@@ -503,11 +503,10 @@ void EffectsRD::screen_space_reflection(RID p_diffuse, RID p_normal_roughness, R
 
 		if (p_roughness_quality != RS::ENV_SSR_ROUGNESS_QUALITY_DISABLED) {
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_image_pair(p_output, p_blur_radius), 1);
-			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture_pair(p_metallic, p_normal_roughness), 3);
 		} else {
 			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_output), 1);
-			RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture(p_metallic), 3);
 		}
+		RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture(p_metallic), 3);
 		RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_scale_normal), 2);
 
 		RD::get_singleton()->compute_list_dispatch_threads(compute_list, p_screen_size.width, p_screen_size.height, 1);
diff --git a/servers/rendering/renderer_rd/shaders/screen_space_reflection_scale.glsl b/servers/rendering/renderer_rd/shaders/screen_space_reflection_scale.glsl
index 7e06516d90..2328effe7b 100644
--- a/servers/rendering/renderer_rd/shaders/screen_space_reflection_scale.glsl
+++ b/servers/rendering/renderer_rd/shaders/screen_space_reflection_scale.glsl
@@ -36,12 +36,12 @@ void main() {
 	float divisor = 0.0;
 	vec4 color;
 	float depth;
-	vec3 normal;
+	vec4 normal;
 
 	if (params.filtered) {
 		color = vec4(0.0);
 		depth = 0.0;
-		normal = vec3(0.0);
+		normal = vec4(0.0);
 
 		for (int i = 0; i < 4; i++) {
 			ivec2 ofs = ssC << 1;
@@ -53,7 +53,9 @@ void main() {
 			}
 			color += texelFetch(source_ssr, ofs, 0);
 			float d = texelFetch(source_depth, ofs, 0).r;
-			normal += texelFetch(source_normal, ofs, 0).xyz * 2.0 - 1.0;
+			vec4 nr = texelFetch(source_normal, ofs, 0);
+			normal.xyz += nr.xyz * 2.0 - 1.0;
+			normal.w += nr.w;
 
 			d = d * 2.0 - 1.0;
 			if (params.orthogonal) {
@@ -66,11 +68,12 @@ void main() {
 
 		color /= 4.0;
 		depth /= 4.0;
-		normal = normalize(normal / 4.0) * 0.5 + 0.5;
+		normal.xyz = normalize(normal.xyz / 4.0) * 0.5 + 0.5;
+		normal.w /= 4.0;
 	} else {
 		color = texelFetch(source_ssr, ssC << 1, 0);
 		depth = texelFetch(source_depth, ssC << 1, 0).r;
-		normal = texelFetch(source_normal, ssC << 1, 0).xyz;
+		normal = texelFetch(source_normal, ssC << 1, 0);
 
 		depth = depth * 2.0 - 1.0;
 		if (params.orthogonal) {
@@ -83,5 +86,5 @@ void main() {
 
 	imageStore(dest_ssr, ssC, color);
 	imageStore(dest_depth, ssC, vec4(depth));
-	imageStore(dest_normal, ssC, vec4(normal, 0.0));
+	imageStore(dest_normal, ssC, normal);
 }