Merge pull request #98614 from DarioSamo/soft-shadow-samples-fix

clayjohn · web-flow · commit 08f9cba0fbf2 · 2024-10-28T15:17:23.000-07:00
Fix soft shadows by increasing the bit count for specialization constants.
diff --git a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
@@ -108,10 +108,10 @@ class SceneShaderForwardClustered {
 				uint32_t projector_use_mipmaps : 1;
 				uint32_t use_depth_fog : 1;
 				uint32_t use_lightmap_bicubic_filter : 1;
-				uint32_t soft_shadow_samples : 4;
-				uint32_t penumbra_shadow_samples : 4;
-				uint32_t directional_soft_shadow_samples : 4;
-				uint32_t directional_penumbra_shadow_samples : 4;
+				uint32_t soft_shadow_samples : 6;
+				uint32_t penumbra_shadow_samples : 6;
+				uint32_t directional_soft_shadow_samples : 6;
+				uint32_t directional_penumbra_shadow_samples : 6;
 			};
 
 			uint32_t packed_0;
diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
@@ -322,7 +322,12 @@ void SceneShaderForwardMobile::ShaderData::_create_pipeline(PipelineKey p_pipeli
 	specialization_constants.push_back(sc);
 
 	sc.constant_id = 1;
-	sc.float_value = p_pipeline_key.shader_specialization.packed_1;
+	sc.int_value = p_pipeline_key.shader_specialization.packed_1;
+	sc.type = RD::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_INT;
+	specialization_constants.push_back(sc);
+
+	sc.constant_id = 2;
+	sc.float_value = p_pipeline_key.shader_specialization.packed_2;
 	sc.type = RD::PIPELINE_SPECIALIZATION_CONSTANT_TYPE_FLOAT;
 	specialization_constants.push_back(sc);
 
diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
@@ -74,22 +74,23 @@ class SceneShaderForwardMobile {
 				uint32_t use_depth_fog : 1;
 				uint32_t is_multimesh : 1;
 				uint32_t use_lightmap_bicubic_filter : 1;
-				uint32_t pad : 2;
-				uint32_t soft_shadow_samples : 4;
-				uint32_t penumbra_shadow_samples : 4;
-				uint32_t directional_soft_shadow_samples : 4;
-				uint32_t directional_penumbra_shadow_samples : 4;
+				uint32_t soft_shadow_samples : 6;
+				uint32_t penumbra_shadow_samples : 6;
+				uint32_t directional_soft_shadow_samples : 6;
 			};
 
 			uint32_t packed_0;
 		};
 
 		union {
-			float luminance_multiplier;
-			float packed_1;
+			uint32_t directional_penumbra_shadow_samples : 6;
+			uint32_t packed_1;
 		};
 
-		uint32_t packed_2;
+		union {
+			float luminance_multiplier;
+			float packed_2;
+		};
 	};
 
 	struct UbershaderConstants {
diff --git a/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered_inc.glsl b/servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered_inc.glsl
@@ -107,19 +107,19 @@ bool sc_use_lightmap_bicubic_filter() {
 }
 
 uint sc_soft_shadow_samples() {
-	return (sc_packed_0() >> 8) & 15U;
+	return (sc_packed_0() >> 8) & 63U;
 }
 
 uint sc_penumbra_shadow_samples() {
-	return (sc_packed_0() >> 12) & 15U;
+	return (sc_packed_0() >> 14) & 63U;
 }
 
 uint sc_directional_soft_shadow_samples() {
-	return (sc_packed_0() >> 16) & 15U;
+	return (sc_packed_0() >> 20) & 63U;
 }
 
 uint sc_directional_penumbra_shadow_samples() {
-	return (sc_packed_0() >> 20) & 15U;
+	return (sc_packed_0() >> 26) & 63U;
 }
 
 float sc_luminance_multiplier() {
diff --git a/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile_inc.glsl b/servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile_inc.glsl
@@ -22,8 +22,8 @@ layout(push_constant, std430) uniform DrawCall {
 	uint pad;
 #ifdef UBERSHADER
 	uint sc_packed_0;
-	float sc_packed_1;
-	uint sc_packed_2;
+	uint sc_packed_1;
+	float sc_packed_2;
 	uint uc_packed_0;
 #endif
 }
@@ -42,10 +42,14 @@ uint sc_packed_0() {
 	return draw_call.sc_packed_0;
 }
 
-float sc_packed_1() {
+uint sc_packed_1() {
 	return draw_call.sc_packed_1;
 }
 
+float sc_packed_2() {
+	return draw_call.sc_packed_2;
+}
+
 uint uc_cull_mode() {
 	return (draw_call.uc_packed_0 >> 0) & 3U;
 }
@@ -54,16 +58,21 @@ uint uc_cull_mode() {
 
 // Pull the constants from the pipeline's specialization constants.
 layout(constant_id = 0) const uint pso_sc_packed_0 = 0;
-layout(constant_id = 1) const float pso_sc_packed_1 = 2.0;
+layout(constant_id = 1) const uint pso_sc_packed_1 = 0;
+layout(constant_id = 2) const float pso_sc_packed_2 = 2.0;
 
 uint sc_packed_0() {
 	return pso_sc_packed_0;
 }
 
-float sc_packed_1() {
+uint sc_packed_1() {
 	return pso_sc_packed_1;
 }
 
+float sc_packed_2() {
+	return pso_sc_packed_2;
+}
+
 #endif
 
 bool sc_use_light_projector() {
@@ -123,23 +132,23 @@ bool sc_use_lightmap_bicubic_filter() {
 }
 
 uint sc_soft_shadow_samples() {
-	return (sc_packed_0() >> 16) & 15U;
+	return (sc_packed_0() >> 14) & 63U;
 }
 
 uint sc_penumbra_shadow_samples() {
-	return (sc_packed_0() >> 20) & 15U;
+	return (sc_packed_0() >> 20) & 63U;
 }
 
 uint sc_directional_soft_shadow_samples() {
-	return (sc_packed_0() >> 24) & 15U;
+	return (sc_packed_0() >> 26) & 63U;
 }
 
 uint sc_directional_penumbra_shadow_samples() {
-	return (sc_packed_0() >> 28) & 15U;
+	return (sc_packed_1() >> 0) & 63U;
 }
 
 float sc_luminance_multiplier() {
-	return sc_packed_1();
+	return sc_packed_2();
 }
 
 /* Set 0: Base Pass (never changes) */

Original file line number	Diff line number	Diff line change
`@@ -107,19 +107,19 @@ bool sc_use_lightmap_bicubic_filter() {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`uint sc_soft_shadow_samples() {`
`110`		`- return (sc_packed_0() >> 8) & 15U;`
	`110`	`+ return (sc_packed_0() >> 8) & 63U;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`uint sc_penumbra_shadow_samples() {`
`114`		`- return (sc_packed_0() >> 12) & 15U;`
	`114`	`+ return (sc_packed_0() >> 14) & 63U;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`uint sc_directional_soft_shadow_samples() {`
`118`		`- return (sc_packed_0() >> 16) & 15U;`
	`118`	`+ return (sc_packed_0() >> 20) & 63U;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`uint sc_directional_penumbra_shadow_samples() {`
`122`		`- return (sc_packed_0() >> 20) & 15U;`
	`122`	`+ return (sc_packed_0() >> 26) & 63U;`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`float sc_luminance_multiplier() {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ layout(push_constant, std430) uniform DrawCall {`
`22`	`22`	`uint pad;`
`23`	`23`	`#ifdef UBERSHADER`
`24`	`24`	`uint sc_packed_0;`
`25`		`- float sc_packed_1;`
`26`		`- uint sc_packed_2;`
	`25`	`+ uint sc_packed_1;`
	`26`	`+ float sc_packed_2;`
`27`	`27`	`uint uc_packed_0;`
`28`	`28`	`#endif`
`29`	`29`	`}`
`@@ -42,10 +42,14 @@ uint sc_packed_0() {`
`42`	`42`	`return draw_call.sc_packed_0;`
`43`	`43`	`}`
`44`	`44`
`45`		`-float sc_packed_1() {`
	`45`	`+uint sc_packed_1() {`
`46`	`46`	`return draw_call.sc_packed_1;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+float sc_packed_2() {`
	`50`	`+ return draw_call.sc_packed_2;`
	`51`	`+}`
	`52`	`+`
`49`	`53`	`uint uc_cull_mode() {`
`50`	`54`	`return (draw_call.uc_packed_0 >> 0) & 3U;`
`51`	`55`	`}`
`@@ -54,16 +58,21 @@ uint uc_cull_mode() {`
`54`	`58`
`55`	`59`	`// Pull the constants from the pipeline's specialization constants.`
`56`	`60`	`layout(constant_id = 0) const uint pso_sc_packed_0 = 0;`
`57`		`-layout(constant_id = 1) const float pso_sc_packed_1 = 2.0;`
	`61`	`+layout(constant_id = 1) const uint pso_sc_packed_1 = 0;`
	`62`	`+layout(constant_id = 2) const float pso_sc_packed_2 = 2.0;`
`58`	`63`
`59`	`64`	`uint sc_packed_0() {`
`60`	`65`	`return pso_sc_packed_0;`
`61`	`66`	`}`
`62`	`67`
`63`		`-float sc_packed_1() {`
	`68`	`+uint sc_packed_1() {`
`64`	`69`	`return pso_sc_packed_1;`
`65`	`70`	`}`
`66`	`71`
	`72`	`+float sc_packed_2() {`
	`73`	`+ return pso_sc_packed_2;`
	`74`	`+}`
	`75`	`+`
`67`	`76`	`#endif`
`68`	`77`
`69`	`78`	`bool sc_use_light_projector() {`
`@@ -123,23 +132,23 @@ bool sc_use_lightmap_bicubic_filter() {`
`123`	`132`	`}`
`124`	`133`
`125`	`134`	`uint sc_soft_shadow_samples() {`
`126`		`- return (sc_packed_0() >> 16) & 15U;`
	`135`	`+ return (sc_packed_0() >> 14) & 63U;`
`127`	`136`	`}`
`128`	`137`
`129`	`138`	`uint sc_penumbra_shadow_samples() {`
`130`		`- return (sc_packed_0() >> 20) & 15U;`
	`139`	`+ return (sc_packed_0() >> 20) & 63U;`
`131`	`140`	`}`
`132`	`141`
`133`	`142`	`uint sc_directional_soft_shadow_samples() {`
`134`		`- return (sc_packed_0() >> 24) & 15U;`
	`143`	`+ return (sc_packed_0() >> 26) & 63U;`
`135`	`144`	`}`
`136`	`145`
`137`	`146`	`uint sc_directional_penumbra_shadow_samples() {`
`138`		`- return (sc_packed_0() >> 28) & 15U;`
	`147`	`+ return (sc_packed_1() >> 0) & 63U;`
`139`	`148`	`}`
`140`	`149`
`141`	`150`	`float sc_luminance_multiplier() {`
`142`		`- return sc_packed_1();`
	`151`	`+ return sc_packed_2();`
`143`	`152`	`}`
`144`	`153`
`145`	`154`	`/* Set 0: Base Pass (never changes) */`