Skip to content

Commit 7bc33bd

Browse files
committed
Merge pull request #106748 from BlueCube3310/mobile-lightmaps
Mobile: Move `_setup_lightmaps` before `_fill_render_list`
2 parents fa967cb + 546b40e commit 7bc33bd

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,9 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
841841

842842
p_render_data->directional_light_count = directional_light_count;
843843

844+
// Lightmaps need to be set up before _fill_render_list as it depends on them.
845+
_setup_lightmaps(p_render_data, *p_render_data->lightmaps, p_render_data->scene_data->cam_transform);
846+
844847
// fill our render lists early so we can find out if we use various features
845848
_fill_render_list(RENDER_LIST_OPAQUE, p_render_data, PASS_MODE_COLOR);
846849
render_list[RENDER_LIST_OPAQUE].sort_by_key();
@@ -937,7 +940,6 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
937940

938941
RD::get_singleton()->draw_command_begin_label("Render Setup");
939942

940-
_setup_lightmaps(p_render_data, *p_render_data->lightmaps, p_render_data->scene_data->cam_transform);
941943
_setup_environment(p_render_data, is_reflection_probe, screen_size, p_default_bg_color, false);
942944

943945
// May have changed due to the above (light buffer enlarged, as an example).

0 commit comments

Comments
 (0)