[PATCH 4/5] d3d10: Move debug_d3d10_driver_type() to d3d10_main.c.
Henri Verbeet
hverbeet at codeweavers.com
Wed Oct 30 09:01:32 CDT 2019
From: Connor McAdams <conmanx360 at gmail.com>
Signed-off-by: Connor McAdams <conmanx360 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
This supersedes patch 172214.
dlls/d3d10/d3d10_main.c | 19 +++++++++++++++++++
dlls/d3d10/d3d10_private.h | 1 -
dlls/d3d10/utils.c | 15 ---------------
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index e3d1c57e448..a54c44bdbb9 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -24,6 +24,25 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
+#define WINE_D3D10_TO_STR(x) case x: return #x
+
+static const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type)
+{
+ switch (driver_type)
+ {
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE);
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE);
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL);
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE);
+ WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP);
+ default:
+ FIXME("Unrecognised D3D10_DRIVER_TYPE %#x.\n", driver_type);
+ return "unrecognised";
+ }
+}
+
+#undef WINE_D3D10_TO_STR
+
static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,
HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device)
{
diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index c9e6dbb8232..1deba9c8601 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -41,7 +41,6 @@
#define D3DERR_INVALIDCALL 0x8876086c
/* TRACE helper functions */
-const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) DECLSPEC_HIDDEN;
const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) DECLSPEC_HIDDEN;
enum d3d10_effect_object_type
diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c
index fca8994ff2e..680a11f37e2 100644
--- a/dlls/d3d10/utils.c
+++ b/dlls/d3d10/utils.c
@@ -23,21 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
#define WINE_D3D10_TO_STR(x) case x: return #x
-const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type)
-{
- switch(driver_type)
- {
- WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE);
- WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE);
- WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL);
- WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE);
- WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP);
- default:
- FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type);
- return "unrecognized";
- }
-}
-
const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t)
{
switch (t)
--
2.11.0
More information about the wine-devel
mailing list