OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Remove MESA_TRACE_BEGIN/END

Browse Source 
There are no user of these macros anymore, simplify the cpu_trace header.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25308>
This commit is contained in:
Corentin Noël
2023-09-20 17:50:20 +02:00
committed by Marge Bot
parent d64765c200
commit 2ef0e6be17
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/perf/cpu_trace.h
View File

@@ -60,19 +60,6 @@
#endif /* HAVE_GPUVIS */ #endif /* HAVE_GPUVIS */
#define _MESA_COMBINED_TRACE_BEGIN(name) \
do { \
_MESA_TRACE_BEGIN(name); \
_MESA_GPUVIS_TRACE_BEGIN(name); \
} while (0)
#define _MESA_COMBINED_TRACE_END() \
do { \
_MESA_GPUVIS_TRACE_END(); \
_MESA_TRACE_END(); \
} while (0)
#if __has_attribute(cleanup) && __has_attribute(unused) #if __has_attribute(cleanup) && __has_attribute(unused)
#define _MESA_TRACE_SCOPE_VAR_CONCAT(name, suffix) name##suffix #define _MESA_TRACE_SCOPE_VAR_CONCAT(name, suffix) name##suffix
@@ -94,14 +81,16 @@
static inline int static inline int
_mesa_trace_scope_begin(const char *name) _mesa_trace_scope_begin(const char *name)
{ {
_MESA_COMBINED_TRACE_BEGIN(name); _MESA_TRACE_BEGIN(name);
_MESA_GPUVIS_TRACE_BEGIN(name);
return 0; return 0;
} }
static inline void static inline void
_mesa_trace_scope_end(UNUSED int *scope) _mesa_trace_scope_end(UNUSED int *scope)
{ {
_MESA_COMBINED_TRACE_END(); _MESA_GPUVIS_TRACE_END();
_MESA_TRACE_END();
} }
#else #else
@@ -110,8 +99,6 @@ _mesa_trace_scope_end(UNUSED int *scope)
#endif /* __has_attribute(cleanup) && __has_attribute(unused) */ #endif /* __has_attribute(cleanup) && __has_attribute(unused) */
#define MESA_TRACE_BEGIN(name) _MESA_COMBINED_TRACE_BEGIN(name)
#define MESA_TRACE_END() _MESA_COMBINED_TRACE_END()
#define MESA_TRACE_SCOPE(name) _MESA_TRACE_SCOPE(name) #define MESA_TRACE_SCOPE(name) _MESA_TRACE_SCOPE(name)
#define MESA_TRACE_FUNC() _MESA_TRACE_SCOPE(__func__) #define MESA_TRACE_FUNC() _MESA_TRACE_SCOPE(__func__)

2
src/virtio/vulkan/vn_common.h
View File

@@ -55,8 +55,6 @@
#define vn_result(instance, result) \ #define vn_result(instance, result) \
((result) >= VK_SUCCESS ? (result) : vn_error((instance), (result))) ((result) >= VK_SUCCESS ? (result) : vn_error((instance), (result)))
#define VN_TRACE_BEGIN(name) MESA_TRACE_BEGIN(name)
#define VN_TRACE_END() MESA_TRACE_END()
#define VN_TRACE_SCOPE(name) MESA_TRACE_SCOPE(name) #define VN_TRACE_SCOPE(name) MESA_TRACE_SCOPE(name)
#define VN_TRACE_FUNC() MESA_TRACE_SCOPE(__func__) #define VN_TRACE_FUNC() MESA_TRACE_SCOPE(__func__)