vkd3d-common: Get rid of "vkd3d_dbg_env_name".

This commit is contained in:
Henri Verbeet
2025-11-11 13:44:28 +01:00
parent 7022bb57fc
commit cb3367c66d
Notes: Henri Verbeet 2025-11-12 15:30:53 +01:00
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1821
6 changed files with 18 additions and 21 deletions

View File

@@ -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

View File

@@ -23,8 +23,6 @@
#include <stdio.h>
#include <math.h>
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);
}
}

View File

@@ -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)

View File

@@ -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)
{