godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Renderer: Eliminates String allocations for all labels in the renderer

Browse Source 
Uses `Span<char>` to avoid additional allocations in the graph.
This commit is contained in:
Stuart Carnie
2025-05-23 06:52:10 +10:00
parent 6c9765d87e
commit 7d93119353
10 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/metal/rendering_context_driver_metal.h
View File

@@ -56,6 +56,8 @@ class PixelFormats;
class MDResourceCache; class MDResourceCache;
class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingContextDriverMetal : public RenderingContextDriver { class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingContextDriverMetal : public RenderingContextDriver {
bool capture_available = false;
protected: protected:
#ifdef __OBJC__ #ifdef __OBJC__
id<MTLDevice> metal_device = nullptr; id<MTLDevice> metal_device = nullptr;
@@ -80,7 +82,7 @@ public:
void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) final override; void surface_set_needs_resize(SurfaceID p_surface, bool p_needs_resize) final override;
bool surface_get_needs_resize(SurfaceID p_surface) const final override; bool surface_get_needs_resize(SurfaceID p_surface) const final override;
void surface_destroy(SurfaceID p_surface) final override; void surface_destroy(SurfaceID p_surface) final override;
bool is_debug_utils_enabled() const final override { return true; } bool is_debug_utils_enabled() const final override { return capture_available; }
#pragma mark - Metal-specific methods #pragma mark - Metal-specific methods

4
drivers/metal/rendering_context_driver_metal.mm
View File

@@ -45,6 +45,10 @@ RenderingContextDriverMetal::~RenderingContextDriverMetal() {
} }
Error RenderingContextDriverMetal::initialize() { Error RenderingContextDriverMetal::initialize() {
if (OS::get_singleton()->get_environment(U"METAL_DEVICE_WRAPPER_TYPE") == "1") {
capture_available = true;
}
metal_device = MTLCreateSystemDefaultDevice(); metal_device = MTLCreateSystemDefaultDevice();
#if TARGET_OS_OSX #if TARGET_OS_OSX
if (@available(macOS 13.3, *)) { if (@available(macOS 13.3, *)) {

4
servers/rendering/renderer_rd/effects/fsr.h
View File

@@ -38,13 +38,11 @@
namespace RendererRD { namespace RendererRD {
class FSR : public SpatialUpscaler { class FSR : public SpatialUpscaler {
String name = "FSR 1.0 Upscale";
public: public:
FSR(); FSR();
~FSR(); ~FSR();
virtual String get_label() const final { return name; } virtual const Span<char> get_label() const final { return "FSR 1.0 Upscale"; }
virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) final {} virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) final {}
virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_rd_texture, RID p_destination_texture) final; virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_rd_texture, RID p_destination_texture) final;

3
servers/rendering/renderer_rd/effects/metal_fx.h
View File

@@ -76,10 +76,9 @@ class MFXSpatialEffect : public SpatialUpscaler {
PagedAllocator<CallbackArgs, true, 16> args_allocator; PagedAllocator<CallbackArgs, true, 16> args_allocator;
static void callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata); static void callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata);
String name = "MetalFX Spatial Upscale";
public: public:
virtual String get_label() const final { return name; } virtual const Span<char> get_label() const final { return "MetalFX Spatial Upscale"; }
virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) final; virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) final;
virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_src, RID p_dst) final; virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_src, RID p_dst) final;

2
servers/rendering/renderer_rd/effects/spatial_upscaler.h
View File

@@ -36,7 +36,7 @@ class RenderSceneBuffersRD;
class SpatialUpscaler { class SpatialUpscaler {
public: public:
virtual String get_label() const = 0; virtual const Span<char> get_label() const = 0;
virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) = 0; virtual void ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) = 0;
virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_rd_texture, RID p_destination_texture) = 0; virtual void process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p_source_rd_texture, RID p_destination_texture) = 0;

8
servers/rendering/renderer_rd/effects/ss_effects.cpp
View File

@@ -985,7 +985,7 @@ void SSEffects::gather_ssao(RD::ComputeListID p_compute_list, const RID *p_ao_sl
continue; continue;
} }
RD::Uniform u_ao_slice(RD::UNIFORM_TYPE_IMAGE, 0, Vector<RID>({ p_ao_slices[i] })); RD::Uniform u_ao_slice(RD::UNIFORM_TYPE_IMAGE, 0, p_ao_slices[i]);
ssao.gather_push_constant.pass_coord_offset[0] = i % 2; ssao.gather_push_constant.pass_coord_offset[0] = i % 2;
ssao.gather_push_constant.pass_coord_offset[1] = i / 2; ssao.gather_push_constant.pass_coord_offset[1] = i / 2;
@@ -1419,7 +1419,11 @@ void SSEffects::screen_space_reflection(Ref<RenderSceneBuffersRD> p_render_buffe
blur_radius[1] = p_render_buffers->get_texture_slice(RB_SCOPE_SSR, RB_BLUR_RADIUS, 1, 0); blur_radius[1] = p_render_buffers->get_texture_slice(RB_SCOPE_SSR, RB_BLUR_RADIUS, 1, 0);
} }
RD::get_singleton()->draw_command_begin_label(String("SSR View ") + itos(v)); {
char label[16];
int len = snprintf(label, sizeof(label), "SSR View %d", v);
RD::get_singleton()->draw_command_begin_label(Span<char>(label, len));
}
{ //scale color and depth to half { //scale color and depth to half
RD::get_singleton()->draw_command_begin_label("SSR Scale"); RD::get_singleton()->draw_command_begin_label("SSR Scale");

8
servers/rendering/rendering_device.cpp
View File

@@ -6200,7 +6200,11 @@ void RenderingDevice::set_resource_name(RID p_id, const String &p_name) {
#endif #endif
} }
void RenderingDevice::draw_command_begin_label(String p_label_name, const Color &p_color) { void RenderingDevice::_draw_command_begin_label(String p_label_name, const Color &p_color) {
draw_command_begin_label(p_label_name.utf8().span(), p_color);
}
void RenderingDevice::draw_command_begin_label(const Span<char> p_label_name, const Color &p_color) {
ERR_RENDER_THREAD_GUARD(); ERR_RENDER_THREAD_GUARD();
if (!context->is_debug_utils_enabled()) { if (!context->is_debug_utils_enabled()) {
@@ -7450,7 +7454,7 @@ void RenderingDevice::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_resource_name", "id", "name"), &RenderingDevice::set_resource_name); ClassDB::bind_method(D_METHOD("set_resource_name", "id", "name"), &RenderingDevice::set_resource_name);
ClassDB::bind_method(D_METHOD("draw_command_begin_label", "name", "color"), &RenderingDevice::draw_command_begin_label); ClassDB::bind_method(D_METHOD("draw_command_begin_label", "name", "color"), &RenderingDevice::_draw_command_begin_label);
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
ClassDB::bind_method(D_METHOD("draw_command_insert_label", "name", "color"), &RenderingDevice::draw_command_insert_label); ClassDB::bind_method(D_METHOD("draw_command_insert_label", "name", "color"), &RenderingDevice::draw_command_insert_label);
#endif #endif

3
servers/rendering/rendering_device.h
View File

@@ -1643,7 +1643,8 @@ public:
void set_resource_name(RID p_id, const String &p_name); void set_resource_name(RID p_id, const String &p_name);
void draw_command_begin_label(String p_label_name, const Color &p_color = Color(1, 1, 1, 1)); void _draw_command_begin_label(String p_label_name, const Color &p_color = Color(1, 1, 1, 1));
void draw_command_begin_label(const Span<char> p_label_name, const Color &p_color = Color(1, 1, 1, 1));
void draw_command_end_label(); void draw_command_end_label();
String get_device_vendor_name() const; String get_device_vendor_name() const;

11
servers/rendering/rendering_device_graph.cpp
View File

@@ -2218,13 +2218,12 @@ void RenderingDeviceGraph::add_synchronization() {
} }
} }
void RenderingDeviceGraph::begin_label(const String &p_label_name, const Color &p_color) { void RenderingDeviceGraph::begin_label(const Span<char> &p_label_name, const Color &p_color) {
uint32_t command_label_offset = command_label_chars.size(); uint32_t command_label_offset = command_label_chars.size();
PackedByteArray command_label_utf8 = p_label_name.to_utf8_buffer(); int command_label_size = p_label_name.size();
int command_label_utf8_size = command_label_utf8.size(); command_label_chars.resize(command_label_offset + command_label_size + 1);
command_label_chars.resize(command_label_offset + command_label_utf8_size + 1); memcpy(&command_label_chars[command_label_offset], p_label_name.ptr(), command_label_size);
memcpy(&command_label_chars[command_label_offset], command_label_utf8.ptr(), command_label_utf8.size()); command_label_chars[command_label_offset + command_label_size] = '\0';
command_label_chars[command_label_offset + command_label_utf8_size] = '\0';
command_label_colors.push_back(p_color); command_label_colors.push_back(p_color);
command_label_offsets.push_back(command_label_offset); command_label_offsets.push_back(command_label_offset);
command_label_index = command_label_count; command_label_index = command_label_count;

2
servers/rendering/rendering_device_graph.h
View File

@@ -816,7 +816,7 @@ public:
void add_texture_update(RDD::TextureID p_dst, ResourceTracker *p_dst_tracker, VectorView<RecordedBufferToTextureCopy> p_buffer_copies, VectorView<ResourceTracker *> p_buffer_trackers = VectorView<ResourceTracker *>()); void add_texture_update(RDD::TextureID p_dst, ResourceTracker *p_dst_tracker, VectorView<RecordedBufferToTextureCopy> p_buffer_copies, VectorView<ResourceTracker *> p_buffer_trackers = VectorView<ResourceTracker *>());
void add_capture_timestamp(RDD::QueryPoolID p_query_pool, uint32_t p_index); void add_capture_timestamp(RDD::QueryPoolID p_query_pool, uint32_t p_index);
void add_synchronization(); void add_synchronization();
void begin_label(const String &p_label_name, const Color &p_color); void begin_label(const Span<char> &p_label_name, const Color &p_color);
void end_label(); void end_label();
void end(bool p_reorder_commands, bool p_full_barriers, RDD::CommandBufferID &r_command_buffer, CommandBufferPool &r_command_buffer_pool); void end(bool p_reorder_commands, bool p_full_barriers, RDD::CommandBufferID &r_command_buffer, CommandBufferPool &r_command_buffer_pool);
static ResourceTracker *resource_tracker_create(); static ResourceTracker *resource_tracker_create();