diff --git a/servers/rendering/renderer_rd/effects/copy_effects.cpp b/servers/rendering/renderer_rd/effects/copy_effects.cpp index 0cb951d6554..69ccb24ecfa 100644 --- a/servers/rendering/renderer_rd/effects/copy_effects.cpp +++ b/servers/rendering/renderer_rd/effects/copy_effects.cpp @@ -1265,7 +1265,7 @@ void CopyEffects::merge_specular(RID p_dest_framebuffer, RID p_specular, RID p_b RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED); - RD::get_singleton()->draw_command_begin_label("Merge specular"); + RD::get_singleton()->draw_command_begin_label("Merge Specular"); RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(p_dest_framebuffer); diff --git a/servers/rendering/renderer_rd/effects/ss_effects.cpp b/servers/rendering/renderer_rd/effects/ss_effects.cpp index 597fcd02d10..edb82415479 100644 --- a/servers/rendering/renderer_rd/effects/ss_effects.cpp +++ b/servers/rendering/renderer_rd/effects/ss_effects.cpp @@ -641,7 +641,7 @@ void SSEffects::screen_space_indirect_lighting(Ref p_rende MaterialStorage *material_storage = MaterialStorage::get_singleton(); ERR_FAIL_NULL(material_storage); - RD::get_singleton()->draw_command_begin_label("Process Screen Space Indirect Lighting"); + RD::get_singleton()->draw_command_begin_label("Process Screen-Space Indirect Lighting"); // Obtain our (cached) buffer slices for the view we are rendering. RID last_frame = p_render_buffers->get_texture_slice(RB_SCOPE_SSIL, RB_LAST_FRAME, p_view, 0, 1, 6); @@ -1069,7 +1069,7 @@ void SSEffects::generate_ssao(Ref p_render_buffers, SSAORe RID shader = ssao.gather_shader.version_get_shader(ssao.gather_shader_version, SSAO_GATHER); RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED); - RD::get_singleton()->draw_command_begin_label("Process Screen Space Ambient Occlusion"); + RD::get_singleton()->draw_command_begin_label("Process Screen-Space Ambient Occlusion"); /* SECOND PASS */ // Sample SSAO { @@ -1233,7 +1233,7 @@ void SSEffects::generate_ssao(Ref p_render_buffers, SSAORe // // Blur // { - RD::get_singleton()->draw_command_begin_label("Edge Aware Blur"); + RD::get_singleton()->draw_command_begin_label("Edge-Aware Blur"); ssao.blur_push_constant.edge_sharpness = 1.0 - p_settings.sharpness; ssao.blur_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssao_buffers.buffer_width; ssao.blur_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssao_buffers.buffer_height; @@ -1464,7 +1464,7 @@ void SSEffects::screen_space_reflection(Ref p_render_buffe } { - RD::get_singleton()->draw_command_begin_label("SSR main"); + RD::get_singleton()->draw_command_begin_label("SSR Main"); ScreenSpaceReflectionPushConstant push_constant; push_constant.view_index = v; @@ -1520,7 +1520,7 @@ void SSEffects::screen_space_reflection(Ref p_render_buffe } if (ssr_roughness_quality != RS::ENV_SSR_ROUGHNESS_QUALITY_DISABLED) { - RD::get_singleton()->draw_command_begin_label("SSR filter"); + RD::get_singleton()->draw_command_begin_label("SSR Roughness Filter"); //blur RD::get_singleton()->compute_list_add_barrier(compute_list); diff --git a/servers/rendering/renderer_rd/environment/gi.cpp b/servers/rendering/renderer_rd/environment/gi.cpp index f4591f1970d..cd2633422e0 100644 --- a/servers/rendering/renderer_rd/environment/gi.cpp +++ b/servers/rendering/renderer_rd/environment/gi.cpp @@ -1238,7 +1238,7 @@ void GI::SDFGI::update(RID p_env, const Vector3 &p_world_position) { } void GI::SDFGI::update_light() { - RD::get_singleton()->draw_command_begin_label("SDFGI Update dynamic Light"); + RD::get_singleton()->draw_command_begin_label("SDFGI Update Dynamic Light"); for (uint32_t i = 0; i < cascades.size(); i++) { RD::get_singleton()->buffer_copy(cascades[i].solid_cell_dispatch_buffer_storage, cascades[i].solid_cell_dispatch_buffer_call, 0, 0, sizeof(uint32_t) * 4); diff --git a/servers/rendering/renderer_rd/environment/sky.cpp b/servers/rendering/renderer_rd/environment/sky.cpp index 2ca0a59613c..d0480b6d33a 100644 --- a/servers/rendering/renderer_rd/environment/sky.cpp +++ b/servers/rendering/renderer_rd/environment/sky.cpp @@ -390,7 +390,7 @@ void SkyRD::ReflectionData::create_reflection_fast_filter(bool p_use_arrays) { bool prefer_raster_effects = copy_effects->get_prefer_raster_effects(); if (prefer_raster_effects) { - RD::get_singleton()->draw_command_begin_label("Downsample radiance map"); + RD::get_singleton()->draw_command_begin_label("Downsample Radiance Map"); for (int k = 0; k < 6; k++) { copy_effects->cubemap_downsample_raster(radiance_base_cubemap, downsampled_layer.mipmaps[0].framebuffers[k], k, downsampled_layer.mipmaps[0].size); } @@ -403,14 +403,14 @@ void SkyRD::ReflectionData::create_reflection_fast_filter(bool p_use_arrays) { RD::get_singleton()->draw_command_end_label(); // Downsample Radiance if (p_use_arrays) { - RD::get_singleton()->draw_command_begin_label("filter radiance map into array heads"); + RD::get_singleton()->draw_command_begin_label("Filter Radiance Map into Array Heads"); for (int i = 0; i < layers.size(); i++) { for (int k = 0; k < 6; k++) { copy_effects->cubemap_filter_raster(downsampled_radiance_cubemap, layers[i].mipmaps[0].framebuffers[k], k, i); } } } else { - RD::get_singleton()->draw_command_begin_label("filter radiance map into mipmaps directly"); + RD::get_singleton()->draw_command_begin_label("Filter Radiance Map into Mipmaps Directly"); for (int j = 0; j < layers[0].mipmaps.size(); j++) { for (int k = 0; k < 6; k++) { copy_effects->cubemap_filter_raster(downsampled_radiance_cubemap, layers[0].mipmaps[j].framebuffers[k], k, j); @@ -419,7 +419,7 @@ void SkyRD::ReflectionData::create_reflection_fast_filter(bool p_use_arrays) { } RD::get_singleton()->draw_command_end_label(); // Filter radiance } else { - RD::get_singleton()->draw_command_begin_label("Downsample radiance map"); + RD::get_singleton()->draw_command_begin_label("Downsample Radiance Map"); copy_effects->cubemap_downsample(radiance_base_cubemap, downsampled_layer.mipmaps[0].view, downsampled_layer.mipmaps[0].size); for (int i = 1; i < downsampled_layer.mipmaps.size(); i++) { @@ -436,7 +436,7 @@ void SkyRD::ReflectionData::create_reflection_fast_filter(bool p_use_arrays) { views.push_back(layers[0].views[i]); } } - RD::get_singleton()->draw_command_begin_label("Fast filter radiance"); + RD::get_singleton()->draw_command_begin_label("Fast Filter Radiance"); copy_effects->cubemap_filter(downsampled_radiance_cubemap, views, p_use_arrays); RD::get_singleton()->draw_command_end_label(); // Filter radiance } @@ -449,7 +449,7 @@ void SkyRD::ReflectionData::create_reflection_importance_sample(bool p_use_array if (prefer_raster_effects) { if (p_base_layer == 1) { - RD::get_singleton()->draw_command_begin_label("Downsample radiance map"); + RD::get_singleton()->draw_command_begin_label("Downsample Radiance Map"); for (int k = 0; k < 6; k++) { copy_effects->cubemap_downsample_raster(radiance_base_cubemap, downsampled_layer.mipmaps[0].framebuffers[k], k, downsampled_layer.mipmaps[0].size); } @@ -462,7 +462,7 @@ void SkyRD::ReflectionData::create_reflection_importance_sample(bool p_use_array RD::get_singleton()->draw_command_end_label(); // Downsample Radiance } - RD::get_singleton()->draw_command_begin_label("High Quality filter radiance"); + RD::get_singleton()->draw_command_begin_label("High Quality Filter Radiance"); if (p_use_arrays) { for (int k = 0; k < 6; k++) { copy_effects->cubemap_roughness_raster( @@ -486,7 +486,7 @@ void SkyRD::ReflectionData::create_reflection_importance_sample(bool p_use_array } } else { if (p_base_layer == 1) { - RD::get_singleton()->draw_command_begin_label("Downsample radiance map"); + RD::get_singleton()->draw_command_begin_label("Downsample Radiance Map"); copy_effects->cubemap_downsample(radiance_base_cubemap, downsampled_layer.mipmaps[0].view, downsampled_layer.mipmaps[0].size); for (int i = 1; i < downsampled_layer.mipmaps.size(); i++) { @@ -495,7 +495,7 @@ void SkyRD::ReflectionData::create_reflection_importance_sample(bool p_use_array RD::get_singleton()->draw_command_end_label(); // Downsample Radiance } - RD::get_singleton()->draw_command_begin_label("High Quality filter radiance"); + RD::get_singleton()->draw_command_begin_label("High Quality Filter Radiance"); if (p_use_arrays) { copy_effects->cubemap_roughness(downsampled_radiance_cubemap, layers[p_base_layer].views[0], p_cube_side, p_sky_ggx_samples_quality, float(p_base_layer) / (layers.size() - 1.0), layers[p_base_layer].mipmaps[0].size.x); } else { @@ -1321,7 +1321,7 @@ void SkyRD::update_radiance_buffers(Ref p_render_buffers, // Note, we ignore environment_get_sky_orientation here as this is applied when we do our lookup in our scene shader. if (shader_data->uses_quarter_res && roughness_layers >= 3) { - RD::get_singleton()->draw_command_begin_label("Render Sky to Quarter Res Cubemap"); + RD::get_singleton()->draw_command_begin_label("Render Sky to Quarter-Resolution Cubemap"); PipelineCacheRD *pipeline = &shader_data->pipelines[SKY_VERSION_CUBEMAP_QUARTER_RES]; Vector clear_colors; @@ -1342,7 +1342,7 @@ void SkyRD::update_radiance_buffers(Ref p_render_buffers, } if (shader_data->uses_half_res && roughness_layers >= 2) { - RD::get_singleton()->draw_command_begin_label("Render Sky to Half Res Cubemap"); + RD::get_singleton()->draw_command_begin_label("Render Sky to Half-Resolution Cubemap"); PipelineCacheRD *pipeline = &shader_data->pipelines[SKY_VERSION_CUBEMAP_HALF_RES]; Vector clear_colors; diff --git a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp index 8dd87af3019..61859614562 100644 --- a/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp +++ b/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp @@ -2399,7 +2399,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co _process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data); } - RD::get_singleton()->draw_command_begin_label("Copy framebuffer for SSIL"); + RD::get_singleton()->draw_command_begin_label("Copy Framebuffer for SSIL"); if (using_ssil) { RENDER_TIMESTAMP("Copy Final Framebuffer (SSIL)"); _copy_framebuffer_to_ssil(rb); diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp index 268a6015d99..b3e6095e7e3 100644 --- a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp +++ b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp @@ -1302,7 +1302,7 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color } if (rb_data.is_valid() && !using_subpass_post_process) { - RD::get_singleton()->draw_command_begin_label("Post process pass"); + RD::get_singleton()->draw_command_begin_label("Post Process Pass"); if (ce_has_post_transparent) { _process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_POST_TRANSPARENT, p_render_data); diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp index 14b5c7d6ada..b2bfa8b1ffa 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp @@ -350,7 +350,7 @@ void RendererSceneRenderRD::_render_buffers_copy_screen_texture(const RenderData return; } - RD::get_singleton()->draw_command_begin_label("Copy screen texture"); + RD::get_singleton()->draw_command_begin_label("Copy Screen Texture"); StringName texture_name; bool can_use_storage = _render_buffers_can_be_storage(); @@ -421,7 +421,7 @@ void RendererSceneRenderRD::_render_buffers_copy_depth_texture(const RenderDataR return; } - RD::get_singleton()->draw_command_begin_label("Copy depth texture"); + RD::get_singleton()->draw_command_begin_label("Copy Depth Texture"); bool can_use_storage = _render_buffers_can_be_storage(); Size2i size = rb->get_internal_size(); @@ -547,7 +547,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende if (can_use_effects && RSG::camera_attributes->camera_attributes_uses_auto_exposure(p_render_data->camera_attributes)) { RENDER_TIMESTAMP("Auto exposure"); - RD::get_singleton()->draw_command_begin_label("Auto exposure"); + RD::get_singleton()->draw_command_begin_label("Auto Exposure"); Ref luminance_buffers = luminance->get_luminance_buffers(rb); diff --git a/servers/rendering/renderer_rd/storage_rd/light_storage.cpp b/servers/rendering/renderer_rd/storage_rd/light_storage.cpp index 2ae4167e5e1..631aa5e964d 100644 --- a/servers/rendering/renderer_rd/storage_rd/light_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/light_storage.cpp @@ -1482,7 +1482,7 @@ bool LightStorage::reflection_probe_instance_begin_render(RID p_instance, RID p_ atlas->render_buffers.instantiate(); } - RD::get_singleton()->draw_command_begin_label("Reflection probe render"); + RD::get_singleton()->draw_command_begin_label("Reflection Probe Render"); const bool update_always = LightStorage::get_singleton()->reflection_probe_get_update_mode(rpi->probe) == RS::REFLECTION_PROBE_UPDATE_ALWAYS; if (update_always && atlas->reflection.is_valid() && atlas->size != 256) { diff --git a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp index 982ff20a356..97fd1cb1bf7 100644 --- a/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp +++ b/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp @@ -4443,7 +4443,7 @@ void TextureStorage::render_target_gen_back_buffer_mipmaps(RID p_render_target, return; //nothing to do } } - RD::get_singleton()->draw_command_begin_label("Gaussian Blur Mipmaps2"); + RD::get_singleton()->draw_command_begin_label("Gaussian Blur Mipmaps Pass 2"); //then mipmap blur RID prev_texture = rt->backbuffer_mipmap0; Size2i texture_size = rt->size; diff --git a/servers/rendering/rendering_device_graph.cpp b/servers/rendering/rendering_device_graph.cpp index 2fcbe99cea6..f71bea094aa 100644 --- a/servers/rendering/rendering_device_graph.cpp +++ b/servers/rendering/rendering_device_graph.cpp @@ -1140,7 +1140,7 @@ void RenderingDeviceGraph::_run_label_command_change(RDD::CommandBufferID p_comm label_name.append_utf8(label_chars); label_color = command_label_colors[p_new_label_index]; } else if (p_use_label_for_empty) { - label_name = "Command graph"; + label_name = "Command Graph"; label_color = Color(1, 1, 1, 1); } else { return;