From ccf48fff3361cf1046bdbe6d2799a3220f7492b9 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 12 Nov 2008 15:43:46 +0100 Subject: [PATCH] d3d10core: Implement ID3D10Device in d3d10core instead of d3d10. --- dlls/d3d10/Makefile.in | 1 - dlls/d3d10/d3d10_main.c | 19 +--- dlls/d3d10/d3d10_private.h | 10 -- dlls/d3d10/utils.c | 119 ----------------------- dlls/d3d10core/Makefile.in | 6 +- dlls/d3d10core/d3d10core_private.h | 17 ++++ dlls/{d3d10 => d3d10core}/device.c | 9 +- dlls/d3d10core/utils.c | 148 +++++++++++++++++++++++++++++ 8 files changed, 173 insertions(+), 156 deletions(-) rename dlls/{d3d10 => d3d10core}/device.c (99%) create mode 100644 dlls/d3d10core/utils.c diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index eeaa542626f..48d6f1eeee6 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -8,7 +8,6 @@ IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ d3d10_main.c \ - device.c \ utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 57280355fa3..053abd00bd4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -42,25 +42,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { - struct d3d10_device *object; - - FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p partial stub!\n", + FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p stub!\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, device); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate D3D device object memory\n"); - return E_OUTOFMEMORY; - } - - object->vtbl = &d3d10_device_vtbl; - object->refcount = 1; - *device = (ID3D10Device *)object; - - TRACE("Created ID3D10Device %p\n", object); - - return S_OK; + return E_NOTIMPL; } HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f76bda6b0b6..c3057afda7e 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -30,15 +30,5 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); -const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); -const char *debug_dxgi_format(DXGI_FORMAT format); - -/* IDirect3D10Device */ -extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; -struct d3d10_device -{ - const struct ID3D10DeviceVtbl *vtbl; - LONG refcount; -}; #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index c1113afd8c9..461056b9fe6 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -40,123 +40,4 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } -const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) -{ - switch (topology) - { - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_POINTLIST); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ); - WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ); - default: - FIXME("Unrecognized D3D10_PRIMITIVE_TOPOLOGY %#x\n", topology); - return "unrecognized"; - } -} - -const char *debug_dxgi_format(DXGI_FORMAT format) -{ - switch(format) - { - WINE_D3D10_TO_STR(DXGI_FORMAT_UNKNOWN); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32G8X24_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT_S8X24_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_X32_TYPELESS_G8X24_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R11G11B10_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R32_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R24G8_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_D24_UNORM_S8_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R24_UNORM_X8_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_X24_TYPELESS_G8_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_FLOAT); - WINE_D3D10_TO_STR(DXGI_FORMAT_D16_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SINT); - WINE_D3D10_TO_STR(DXGI_FORMAT_A8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R1_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_R9G9B9E5_SHAREDEXP); - WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_B8G8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_G8R8_G8B8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM_SRGB); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM_SRGB); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM_SRGB); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_TYPELESS); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_SNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_B5G6R5_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); - WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); - default: - FIXME("Unrecognized DXGI_FORMAT %#x\n", format); - return "unrecognized"; - } -} - #undef WINE_D3D10_TO_STR diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 605e45349f4..e2e8d7d7c33 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -3,10 +3,12 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3d10core.dll -IMPORTS = kernel32 +IMPORTS = dxguid uuid kernel32 C_SRCS = \ - d3d10core_main.c + d3d10core_main.c \ + device.c \ + utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 46d9eb703f5..0eea6639ddf 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -21,6 +21,23 @@ #include "wine/debug.h" +#define COBJMACROS #include "winbase.h" +#include "winuser.h" +#include "objbase.h" + +#include "d3d10.h" + +/* TRACE helper functions */ +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); +const char *debug_dxgi_format(DXGI_FORMAT format); + +/* IDirect3D10Device */ +extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; +struct d3d10_device +{ + const struct ID3D10DeviceVtbl *vtbl; + LONG refcount; +}; #endif /* __WINE_D3D10CORE_PRIVATE_H */ diff --git a/dlls/d3d10/device.c b/dlls/d3d10core/device.c similarity index 99% rename from dlls/d3d10/device.c rename to dlls/d3d10core/device.c index acaf2553f04..a0cf37c2be3 100644 --- a/dlls/d3d10/device.c +++ b/dlls/d3d10core/device.c @@ -20,9 +20,9 @@ #include "config.h" #include "wine/port.h" -#include "d3d10_private.h" +#include "d3d10core_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); /* IUnknown methods */ @@ -61,11 +61,6 @@ static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) TRACE("%p decreasing refcount to %u\n", This, refcount); - if (!refcount) - { - HeapFree(GetProcessHeap(), 0, This); - } - return refcount; } diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c new file mode 100644 index 00000000000..bfb82625c2e --- /dev/null +++ b/dlls/d3d10core/utils.c @@ -0,0 +1,148 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +#define WINE_D3D10_TO_STR(x) case x: return #x + +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) +{ + switch (topology) + { + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_POINTLIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ); + default: + FIXME("Unrecognized D3D10_PRIMITIVE_TOPOLOGY %#x\n", topology); + return "unrecognized"; + } +} + +const char *debug_dxgi_format(DXGI_FORMAT format) +{ + switch(format) + { + WINE_D3D10_TO_STR(DXGI_FORMAT_UNKNOWN); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G8X24_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT_S8X24_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_X32_TYPELESS_G8X24_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R11G11B10_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R24G8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D24_UNORM_S8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R24_UNORM_X8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_X24_TYPELESS_G8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_D16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R9G9B9E5_SHAREDEXP); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_B8G8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_G8R8_G8B8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B5G6R5_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + default: + FIXME("Unrecognized DXGI_FORMAT %#x\n", format); + return "unrecognized"; + } +} + +#undef WINE_D3D10_TO_STR