From dd40e35ab2dd5d79634db1459ee742ec463a9b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 2 Feb 2021 23:28:01 +0100 Subject: [PATCH] cogl/trace: Fix argument naming The argument passed to COGL_TRACE() and friends is the "name", not the optional "description". Clean this up so we can add description handling too. Part-of: --- cogl/cogl/cogl-trace.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cogl/cogl/cogl-trace.h b/cogl/cogl/cogl-trace.h index 2900da095..4d1e52aae 100644 --- a/cogl/cogl/cogl-trace.h +++ b/cogl/cogl/cogl-trace.h @@ -83,22 +83,22 @@ cogl_auto_trace_end_helper (CoglTraceHead **head) cogl_trace_end (*head); } -#define COGL_TRACE_BEGIN(Name, description) \ +#define COGL_TRACE_BEGIN(Name, name) \ CoglTraceHead CoglTrace##Name = { 0 }; \ if (g_private_get (&cogl_trace_thread_data)) \ - cogl_trace_begin (&CoglTrace##Name, description); \ + cogl_trace_begin (&CoglTrace##Name, name); \ #define COGL_TRACE_END(Name)\ if (g_private_get (&cogl_trace_thread_data)) \ cogl_trace_end (&CoglTrace##Name); -#define COGL_TRACE_BEGIN_SCOPED(Name, description) \ +#define COGL_TRACE_BEGIN_SCOPED(Name, name) \ CoglTraceHead CoglTrace##Name = { 0 }; \ __attribute__((cleanup (cogl_auto_trace_end_helper))) \ CoglTraceHead *ScopedCoglTrace##Name = NULL; \ if (g_private_get (&cogl_trace_thread_data)) \ { \ - cogl_trace_begin (&CoglTrace##Name, description); \ + cogl_trace_begin (&CoglTrace##Name, name); \ ScopedCoglTrace##Name = &CoglTrace##Name; \ } @@ -106,9 +106,9 @@ cogl_auto_trace_end_helper (CoglTraceHead **head) #include -#define COGL_TRACE_BEGIN(Name, description) (void) 0 +#define COGL_TRACE_BEGIN(Name, name) (void) 0 #define COGL_TRACE_END(Name) (void) 0 -#define COGL_TRACE_BEGIN_SCOPED(Name, description) (void) 0 +#define COGL_TRACE_BEGIN_SCOPED(Name, name) (void) 0 COGL_EXPORT void cogl_set_tracing_enabled_on_thread_with_fd (void *data,