Merge pull request #106748 from BlueCube3310/mobile-lightmaps

Mobile: Move `_setup_lightmaps` before `_fill_render_list`
This commit is contained in:
Thaddeus Crews
2025-05-23 09:46:16 -05:00

View File

@@ -841,6 +841,9 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
p_render_data->directional_light_count = directional_light_count;
// Lightmaps need to be set up before _fill_render_list as it depends on them.
_setup_lightmaps(p_render_data, *p_render_data->lightmaps, p_render_data->scene_data->cam_transform);
// fill our render lists early so we can find out if we use various features
_fill_render_list(RENDER_LIST_OPAQUE, p_render_data, PASS_MODE_COLOR);
render_list[RENDER_LIST_OPAQUE].sort_by_key();
@@ -937,7 +940,6 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
RD::get_singleton()->draw_command_begin_label("Render Setup");
_setup_lightmaps(p_render_data, *p_render_data->lightmaps, p_render_data->scene_data->cam_transform);
_setup_environment(p_render_data, is_reflection_probe, screen_size, p_default_bg_color, false);
// May have changed due to the above (light buffer enlarged, as an example).