vkd3d-common: Merge vkd3d_debug.h into vkd3d_common.h.

There doesn't seem much point in separating these. Pretty much all of
vkd3d (eventually) includes vkd3d_debug.h, and vkd3d_debug.h includes
vkd3d_common.h because it uses VKD3D_PRINTF_FUNC. The separation also
makes it inconvenient to use the debug macros in vkd3d_common.h.
This commit is contained in:
Henri Verbeet
2024-03-18 16:16:55 +01:00
committed by Alexandre Julliard
parent 5de5f241a6
commit 2431357fd6
Notes: Alexandre Julliard 2024-03-19 23:18:24 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/732
7 changed files with 121 additions and 154 deletions

View File

@@ -250,7 +250,6 @@ BUILT_SOURCES = $(widl_headers) \
noinst_LTLIBRARIES = libvkd3d-common.la
libvkd3d_common_la_SOURCES = \
include/private/vkd3d_debug.h \
libs/vkd3d-common/blob.c \
libs/vkd3d-common/debug.c \
libs/vkd3d-common/error.c \
@@ -306,7 +305,6 @@ libvkd3d_shader_la_SOURCES = \
include/private/list.h \
include/private/rbtree.h \
include/private/vkd3d_common.h \
include/private/vkd3d_debug.h \
include/private/vkd3d_memory.h \
include/vkd3d_shader.h \
libs/vkd3d-shader/checksum.c \
@@ -344,7 +342,6 @@ EXTRA_DIST = \
libvkd3d_la_SOURCES = \
include/private/vkd3d_blob.h \
include/private/vkd3d_common.h \
include/private/vkd3d_debug.h \
include/private/vkd3d_memory.h \
include/private/vkd3d_shader_utils.h \
include/private/vkd3d_test.h \