From cb3367c66d0b00274422fddd7dbbcf2033966823 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 11 Nov 2025 13:44:28 +0100 Subject: [PATCH] vkd3d-common: Get rid of "vkd3d_dbg_env_name". --- Makefile.am | 2 +- include/private/vkd3d_common.h | 20 ++++++++++++-------- libs/vkd3d-common/debug.c | 9 ++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 4 +--- libs/vkd3d-utils/vkd3d_utils_main.c | 2 -- libs/vkd3d/vkd3d_main.c | 2 -- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index b54dfff2a..226ba6cbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -431,7 +431,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ +libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -DVKD3D_DEBUG_ENV=VKD3D_SHADER_DEBUG -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 16:0:15 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1e8bd36a1..13b21c04c 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -19,6 +19,11 @@ #ifndef __VKD3D_COMMON_H #define __VKD3D_COMMON_H +#ifndef VKD3D_DEBUG_ENV +#define VKD3D_DEBUG_ENV VKD3D_DEBUG +#endif +#define VKD3D_DEBUG_ENV_NAME VKD3D_EXPAND_AND_STRINGIFY(VKD3D_DEBUG_ENV) + #include "config.h" #define WIN32_LEAN_AND_MEAN #include "vkd3d_windows.h" @@ -149,9 +154,10 @@ enum vkd3d_dbg_level VKD3D_DBG_LEVEL_TRACE, }; -enum vkd3d_dbg_level vkd3d_dbg_get_level(void); +enum vkd3d_dbg_level vkd3d_dbg_get_level(const char *vkd3d_dbg_env_name); -void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); +void vkd3d_dbg_printf(const char *vkd3d_dbg_env_name, enum vkd3d_dbg_level level, + const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback); const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); @@ -174,7 +180,7 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); VKD3D_DBG_PRINTF_##level #define VKD3D_DBG_PRINTF(...) \ - vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) + vkd3d_dbg_printf(VKD3D_DEBUG_ENV_NAME, vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0) #define VKD3D_DBG_PRINTF_TRACE(...) VKD3D_DBG_PRINTF(__VA_ARGS__) #define VKD3D_DBG_PRINTF_WARN(...) VKD3D_DBG_PRINTF(__VA_ARGS__) @@ -183,7 +189,7 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #ifdef VKD3D_ABORT_ON_ERR #define VKD3D_DBG_PRINTF_ERR(...) \ - vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); \ + vkd3d_dbg_printf(VKD3D_DEBUG_ENV_NAME, vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); \ abort(); \ } while (0) #else @@ -217,19 +223,17 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #endif #ifndef TRACE_ON -#define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#define TRACE_ON() (vkd3d_dbg_get_level(VKD3D_DEBUG_ENV_NAME) == VKD3D_DBG_LEVEL_TRACE) #endif #ifndef WARN_ON -#define WARN_ON() (vkd3d_dbg_get_level() >= VKD3D_DBG_LEVEL_WARN) +#define WARN_ON() (vkd3d_dbg_get_level(VKD3D_DEBUG_ENV_NAME) >= VKD3D_DBG_LEVEL_WARN) #endif #ifndef FIXME_ONCE #define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN) #endif -#define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name - static inline const char *debugstr_guid(const GUID *guid) { if (!guid) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 32862024b..b5d74ca3d 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -40,8 +40,6 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 -extern const char *const vkd3d_dbg_env_name; - static const char *const debug_level_names[] = { [VKD3D_DBG_LEVEL_NONE ] = "none", @@ -52,7 +50,7 @@ static const char *const debug_level_names[] = [VKD3D_DBG_LEVEL_TRACE] = "trace", }; -enum vkd3d_dbg_level vkd3d_dbg_get_level(void) +enum vkd3d_dbg_level vkd3d_dbg_get_level(const char *vkd3d_dbg_env_name) { static unsigned int level = ~0u; const char *vkd3d_debug; @@ -108,11 +106,12 @@ static uint64_t get_pthread_threadid(void) } #endif -void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) +void vkd3d_dbg_printf(const char *vkd3d_dbg_env_name, + enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) { va_list args; - if (vkd3d_dbg_get_level() < level) + if (vkd3d_dbg_get_level(vkd3d_dbg_env_name) < level) return; #ifdef _WIN32 diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8afd45cf2..ee113f577 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -23,8 +23,6 @@ #include #include -VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); - static inline int char_to_int(char c) { if ('0' <= c && c <= '9') @@ -268,7 +266,7 @@ void vkd3d_shader_trace_text_(const char *text, size_t size, const char *functio q = end; else ++q; - vkd3d_dbg_printf(VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p); + vkd3d_dbg_printf(VKD3D_DEBUG_ENV_NAME, VKD3D_DBG_LEVEL_TRACE, function, "%.*s", (int)(q - p), p); } } diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index b44f32509..6e90b48e8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -19,8 +19,6 @@ #include "vkd3d_utils_private.h" #undef D3D12CreateDevice -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); - static const char *debug_d3d_blob_part(D3D_BLOB_PART part) { switch (part) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5215cf8ef..4c58f0a17 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -18,8 +18,6 @@ #include "vkd3d_private.h" -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); - HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) {