Merge pull request godotengine#111125 from BlueCube3310/lightmap-sort-bitshift

akien-mga · akien-mga · commit 900bd07d10be · 2025-10-06T14:08:07.000+02:00
Fix LightmapGI not being correctly applied to objects
diff --git a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
@@ -844,7 +844,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 
 		RenderElementInfo &element_info = rl->element_info[p_offset + i];
 
-		element_info.value = uint32_t(surface->sort.sort_key2 & 0x0FFF00000000);
+		element_info.value = uint32_t((surface->sort.sort_key2 & 0x0FFF00000000) >> 32u);
 
 		if (cant_repeat) {
 			prev_surface = nullptr;
diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
@@ -1976,7 +1976,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 		RenderElementInfo &element_info = rl->element_info[p_offset + i];
 
 		// Sets lod_index and uses_lightmap at once.
-		element_info.value = uint32_t(surface->sort.sort_key2 & 0x01FF00000000);
+		element_info.value = uint32_t((surface->sort.sort_key2 & 0x01FF00000000) >> 32u);
 	}
 
 	if (p_update_buffer) {

Original file line number	Diff line number	Diff line change
`@@ -1976,7 +1976,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint`
`1976`	`1976`	`RenderElementInfo &element_info = rl->element_info[p_offset + i];`
`1977`	`1977`
`1978`	`1978`	`// Sets lod_index and uses_lightmap at once.`
`1979`		`- element_info.value = uint32_t(surface->sort.sort_key2 & 0x01FF00000000);`
	`1979`	`+ element_info.value = uint32_t((surface->sort.sort_key2 & 0x01FF00000000) >> 32u);`
`1980`	`1980`	`}`
`1981`	`1981`
`1982`	`1982`	`if (p_update_buffer) {`