Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112823 from Ivorforce/tracy-unique-name

Browse source 
Fix `GodotProfileZone` with tracy backend failing with shadowed variable name warnings
This commit is contained in:
Thaddeus Crews 2025-11-17 19:36:15 -06:00
commit 40cba9094f
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/profiling/profiling.h
View file

@ -51,7 +51,7 @@
// Define tracing macros. // Define tracing macros.
#define GodotProfileFrameMark FrameMark #define GodotProfileFrameMark FrameMark
#define GodotProfileZone(m_zone_name) ZoneScopedN(m_zone_name) #define GodotProfileZone(m_zone_name) ZoneNamedN(GD_UNIQUE_NAME(__godot_tracy_szone_), m_zone_name, true)
#define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name) ZoneNamedN(__godot_tracy_zone_##m_group_name, m_zone_name, true) #define GodotProfileZoneGroupedFirst(m_group_name, m_zone_name) ZoneNamedN(__godot_tracy_zone_##m_group_name, m_zone_name, true)
#define GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name) __godot_tracy_zone_##m_group_name.~ScopedZone(); #define GodotProfileZoneGroupedEndEarly(m_group_name, m_zone_name) __godot_tracy_zone_##m_group_name.~ScopedZone();
#ifndef TRACY_CALLSTACK #ifndef TRACY_CALLSTACK

5
core/typedefs.h
View file

@ -465,3 +465,8 @@ constexpr bool is_fully_defined_v = is_fully_defined<T>::value;
#else #else
#define STATIC_ASSERT_INCOMPLETE_TYPE(m_keyword, m_type) #define STATIC_ASSERT_INCOMPLETE_TYPE(m_keyword, m_type)
#endif #endif
#define _GD_VARNAME_CONCAT_B_(m_ignore, m_name) m_name
#define _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_B_(hello there, m_a##m_b##m_c)
#define _GD_VARNAME_CONCAT_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c)
#define GD_UNIQUE_NAME(m_name) _GD_VARNAME_CONCAT_(m_name, _, __COUNTER__)

5
modules/mono/utils/macros.h
View file

@ -30,10 +30,7 @@
#pragma once #pragma once
#define _GD_VARNAME_CONCAT_B_(m_ignore, m_name) m_name #include "core/typedefs.h"
#define _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_B_(hello there, m_a##m_b##m_c)
#define _GD_VARNAME_CONCAT_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c)
#define GD_UNIQUE_NAME(m_name) _GD_VARNAME_CONCAT_(m_name, _, __COUNTER__)
// unreachable // unreachable