Fix union order to simplify empty initializers.

darksylinc · Jan 9, 2025 · 0e06eb8 · 0e06eb8
1 parent 0e3a5ed
commit 0e06eb8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
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
@@ -100,6 +100,8 @@ class SceneShaderForwardClustered {
 
 	struct ShaderSpecialization {
 		union {
+			uint32_t packed_0;
+
 			struct {
 				uint32_t use_forward_gi : 1;
 				uint32_t use_light_projector : 1;
@@ -114,31 +116,29 @@ class SceneShaderForwardClustered {
 				uint32_t directional_soft_shadow_samples : 6;
 				uint32_t directional_penumbra_shadow_samples : 6;
 			};
-
-			uint32_t packed_0;
 		};
 
 		union {
+			uint32_t packed_1;
+
 			struct {
 				uint32_t multimesh : 1;
 				uint32_t multimesh_format_2d : 1;
 				uint32_t multimesh_has_color : 1;
 				uint32_t multimesh_has_custom_data : 1;
 			};
-
-			uint32_t packed_1;
 		};
 
 		uint32_t packed_2;
 	};
 
 	struct UbershaderConstants {
 		union {
+			uint32_t packed_0;
+
 			struct {
 				uint32_t cull_mode : 2;
 			};
-
-			uint32_t packed_0;
 		};
 	};
 

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
@@ -59,6 +59,8 @@ class SceneShaderForwardMobile {
 
 	struct ShaderSpecialization {
 		union {
+			uint32_t packed_0;
+
 			struct {
 				uint32_t use_light_projector : 1;
 				uint32_t use_light_soft_shadows : 1;
@@ -82,11 +84,11 @@ class SceneShaderForwardMobile {
 				uint32_t soft_shadow_samples : 6;
 				uint32_t penumbra_shadow_samples : 6;
 			};
-
-			uint32_t packed_0;
 		};
 
 		union {
+			uint32_t packed_1;
+
 			struct {
 				uint32_t directional_soft_shadow_samples : 6;
 				uint32_t directional_penumbra_shadow_samples : 6;
@@ -96,32 +98,30 @@ class SceneShaderForwardMobile {
 				uint32_t directional_lights : 4;
 				uint32_t decals : 4;
 			};
-
-			uint32_t packed_1;
 		};
 
 		union {
+			uint32_t packed_2;
+
 			struct {
 				uint32_t directional_light_blend_splits : 8;
 				uint32_t padding_1 : 24;
 			};
-
-			uint32_t packed_2;
 		};
 
 		union {
-			float luminance_multiplier;
 			float packed_3;
+			float luminance_multiplier;
 		};
 	};
 
 	struct UbershaderConstants {
 		union {
+			uint32_t packed_0;
+
 			struct {
 				uint32_t cull_mode : 2;
 			};
-
-			uint32_t packed_0;
 		};
 
 		uint32_t padding_1;

diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
@@ -116,11 +116,11 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 
 	struct ShaderSpecialization {
 		union {
+			uint32_t packed_0;
+
 			struct {
 				uint32_t use_lighting : 1;
 			};
-
-			uint32_t packed_0;
 		};
 	};