Skip to content

Commit aaaf764

Browse files
committed
Merge pull request #119223 from Calinou/render-timestamp-add-setup-shadows
Add Setup Shadows render timestamp for the visual profiler
2 parents ce26629 + 376bea6 commit aaaf764

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,8 @@ void RenderForwardClustered::_pre_opaque_render(RenderDataRD *p_render_data, boo
15271527
rb_data = rb->get_custom_data(RB_SCOPE_FORWARD_CLUSTERED);
15281528
}
15291529

1530+
RENDER_TIMESTAMP("Setup Shadows");
1531+
15301532
if (rb.is_valid() && p_use_gi && rb->has_custom_data(RB_SCOPE_SDFGI)) {
15311533
Ref<RendererRD::GI::SDFGI> sdfgi = rb->get_custom_data(RB_SCOPE_SDFGI);
15321534
sdfgi->store_probes();
@@ -1556,10 +1558,12 @@ void RenderForwardClustered::_pre_opaque_render(RenderDataRD *p_render_data, boo
15561558
}
15571559
}
15581560

1559-
RENDER_TIMESTAMP("Render OmniLight Shadows");
1560-
// Cube shadows are rendered in their own way.
1561-
for (const int &index : p_render_data->cube_shadows) {
1562-
_render_shadow_pass(p_render_data->render_shadows[index].light, p_render_data->shadow_atlas, p_render_data->render_shadows[index].pass, p_render_data->render_shadows[index].instances, lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, true, true, true, p_render_data->render_info, viewport_size, p_render_data->scene_data->cam_transform);
1561+
if (p_render_data->cube_shadows.size()) {
1562+
RENDER_TIMESTAMP("Render OmniLight Shadows");
1563+
// Cube shadows are rendered in their own way.
1564+
for (const int &index : p_render_data->cube_shadows) {
1565+
_render_shadow_pass(p_render_data->render_shadows[index].light, p_render_data->shadow_atlas, p_render_data->render_shadows[index].pass, p_render_data->render_shadows[index].instances, lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, true, true, true, p_render_data->render_info, viewport_size, p_render_data->scene_data->cam_transform);
1566+
}
15631567
}
15641568

15651569
if (p_render_data->directional_shadows.size()) {
@@ -1576,9 +1580,9 @@ void RenderForwardClustered::_pre_opaque_render(RenderDataRD *p_render_data, boo
15761580
bool render_gi = rb.is_valid() && p_use_gi;
15771581

15781582
if (render_shadows && render_gi) {
1579-
RENDER_TIMESTAMP("Render GI + Render Shadows (Parallel)");
1583+
RENDER_TIMESTAMP("Render GI + Render Directional/SpotLight Shadows (Parallel)");
15801584
} else if (render_shadows) {
1581-
RENDER_TIMESTAMP("Render Shadows");
1585+
RENDER_TIMESTAMP("Render Directional/SpotLight Shadows");
15821586
} else if (render_gi) {
15831587
RENDER_TIMESTAMP("Render GI");
15841588
}

servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ void RenderForwardMobile::_setup_lightmaps(const RenderDataRD *p_render_data, co
767767
void RenderForwardMobile::_pre_opaque_render(RenderDataRD *p_render_data) {
768768
RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
769769

770+
RENDER_TIMESTAMP("Setup Shadows");
771+
770772
p_render_data->cube_shadows.clear();
771773
p_render_data->shadows.clear();
772774
p_render_data->directional_shadows.clear();

0 commit comments

Comments
 (0)