[PATCH 1/7] d3d11: Move d3d10core to d3d11.
Józef Kucia
jkucia at codeweavers.com
Wed Aug 19 18:47:54 CDT 2015
This patch simply moves source files from d3d10core to d3d11, and adds
trivial changes in order to force d3d10core to use the sources from the
new location.
---
dlls/d3d10core/Makefile.in | 19 ++---
dlls/d3d10core/d3d10core_main.c | 90 +++-------------------
dlls/{d3d10core => d3d11}/async.c | 2 +-
dlls/{d3d10core => d3d11}/buffer.c | 2 +-
.../d3d10core_private.h => d3d11/d3d11_private.h} | 12 ++-
dlls/{d3d10core => d3d11}/device.c | 2 +-
dlls/{d3d10core => d3d11}/inputlayout.c | 2 +-
dlls/{d3d10core/d3d10core_main.c => d3d11/layer.c} | 8 +-
dlls/{d3d10core => d3d11}/shader.c | 2 +-
dlls/{d3d10core => d3d11}/state.c | 2 +-
dlls/{d3d10core => d3d11}/texture.c | 2 +-
dlls/{d3d10core => d3d11}/utils.c | 2 +-
dlls/{d3d10core => d3d11}/view.c | 2 +-
13 files changed, 40 insertions(+), 107 deletions(-)
rename dlls/{d3d10core => d3d11}/async.c (99%)
rename dlls/{d3d10core => d3d11}/buffer.c (99%)
rename dlls/{d3d10core/d3d10core_private.h => d3d11/d3d11_private.h} (97%)
rename dlls/{d3d10core => d3d11}/device.c (99%)
rename dlls/{d3d10core => d3d11}/inputlayout.c (99%)
copy dlls/{d3d10core/d3d10core_main.c => d3d11/layer.c} (94%)
rename dlls/{d3d10core => d3d11}/shader.c (99%)
rename dlls/{d3d10core => d3d11}/state.c (99%)
rename dlls/{d3d10core => d3d11}/texture.c (99%)
rename dlls/{d3d10core => d3d11}/utils.c (99%)
rename dlls/{d3d10core => d3d11}/view.c (99%)
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in
index 7ee04a2..0af29a1 100644
--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@@ -3,15 +3,16 @@ IMPORTLIB = d3d10core
IMPORTS = dxguid uuid dxgi wined3d
C_SRCS = \
- async.c \
- buffer.c \
+ ../d3d11/async.c \
+ ../d3d11/buffer.c \
d3d10core_main.c \
- device.c \
- inputlayout.c \
- shader.c \
- state.c \
- texture.c \
- utils.c \
- view.c
+ ../d3d11/device.c \
+ ../d3d11/inputlayout.c \
+ ../d3d11/layer.c \
+ ../d3d11/shader.c \
+ ../d3d11/state.c \
+ ../d3d11/texture.c \
+ ../d3d11/utils.c \
+ ../d3d11/view.c
RC_SRCS = version.rc
diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c
index 9006d95..b440bbb 100644
--- a/dlls/d3d10core/d3d10core_main.c
+++ b/dlls/d3d10core/d3d10core_main.c
@@ -20,99 +20,27 @@
#include "config.h"
#include "wine/port.h"
-#define D3D10CORE_INIT_GUID
-#include "d3d10core_private.h"
+#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
-
-static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWORD *values)
-{
- TRACE("id %#x, count %p, values %p\n", id, count, values);
-
- if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE)
- {
- WARN("Unknown layer id %#x\n", id);
- return E_NOTIMPL;
- }
-
- return S_OK;
-}
+#define COBJMACROS
+#include "d3d10_1.h"
-static UINT WINAPI layer_get_size(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0)
-{
- TRACE("id %#x, args %p, unknown0 %#x\n", id, args, unknown0);
-
- if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE)
- {
- WARN("Unknown layer id %#x\n", id);
- return 0;
- }
-
- return sizeof(struct d3d10_device);
-}
-
-static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0,
- void *device_object, REFIID riid, void **device_layer)
-{
- struct d3d10_device *object;
- HRESULT hr;
-
- TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n",
- id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer);
-
- if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE)
- {
- WARN("Unknown layer id %#x\n", id);
- *device_layer = NULL;
- return E_NOTIMPL;
- }
-
- object = *layer_base;
- if (FAILED(hr = d3d10_device_init(object, device_object)))
- {
- WARN("Failed to initialize device, hr %#x.\n", hr);
- *device_layer = NULL;
- return hr;
- }
- *device_layer = &object->IUnknown_inner;
-
- TRACE("Created d3d10 device at %p\n", object);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
- return S_OK;
-}
+HRESULT d3d10_core_register_layers(void) DECLSPEC_HIDDEN;
+HRESULT d3d10_core_create_device(IDXGIFactory *factory, IDXGIAdapter *adapter,
+ UINT flags, void *unknown0, ID3D10Device **device) DECLSPEC_HIDDEN;
HRESULT WINAPI D3D10CoreRegisterLayers(void)
{
- const struct dxgi_device_layer layers[] =
- {
- {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create},
- };
-
- DXGID3D10RegisterLayers(layers, sizeof(layers)/sizeof(*layers));
-
- return S_OK;
+ return d3d10_core_register_layers();
}
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
UINT flags, void *unknown0, ID3D10Device **device)
{
- IUnknown *dxgi_device;
- HMODULE d3d10core;
- HRESULT hr;
-
TRACE("factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n",
factory, adapter, flags, unknown0, device);
- d3d10core = GetModuleHandleA("d3d10core.dll");
- hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, flags, unknown0, (void **)&dxgi_device);
- if (FAILED(hr))
- {
- WARN("Failed to create device, returning %#x\n", hr);
- return hr;
- }
-
- hr = IUnknown_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)device);
- IUnknown_Release(dxgi_device);
-
- return hr;
+ return d3d10_core_create_device(factory, adapter, flags, unknown0, device);
}
diff --git a/dlls/d3d10core/async.c b/dlls/d3d11/async.c
similarity index 99%
rename from dlls/d3d10core/async.c
rename to dlls/d3d11/async.c
index d5b6686..3d50cc8 100644
--- a/dlls/d3d10core/async.c
+++ b/dlls/d3d11/async.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d11/buffer.c
similarity index 99%
rename from dlls/d3d10core/buffer.c
rename to dlls/d3d11/buffer.c
index 0481fd2..53da531 100644
--- a/dlls/d3d10core/buffer.c
+++ b/dlls/d3d11/buffer.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d11/d3d11_private.h
similarity index 97%
rename from dlls/d3d10core/d3d10core_private.h
rename to dlls/d3d11/d3d11_private.h
index 5d02cca..a9e8d77 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_D3D10CORE_PRIVATE_H
-#define __WINE_D3D10CORE_PRIVATE_H
+#ifndef __WINE_D3D11_PRIVATE_H
+#define __WINE_D3D11_PRIVATE_H
#include "wine/debug.h"
@@ -30,7 +30,7 @@
#include "objbase.h"
#include "d3d10_1.h"
-#ifdef D3D10CORE_INIT_GUID
+#ifdef D3D11_INIT_GUID
#include "initguid.h"
#endif
#include "wine/wined3d.h"
@@ -395,4 +395,8 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I
UINT flags, void *unknown0, void **device);
HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count);
-#endif /* __WINE_D3D10CORE_PRIVATE_H */
+HRESULT d3d10_core_register_layers(void) DECLSPEC_HIDDEN;
+HRESULT d3d10_core_create_device(IDXGIFactory *factory, IDXGIAdapter *adapter,
+ UINT flags, void *unknown0, ID3D10Device **device) DECLSPEC_HIDDEN;
+
+#endif /* __WINE_D3D11_PRIVATE_H */
diff --git a/dlls/d3d10core/device.c b/dlls/d3d11/device.c
similarity index 99%
rename from dlls/d3d10core/device.c
rename to dlls/d3d11/device.c
index 7996710..41786de 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d11/device.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d11/inputlayout.c
similarity index 99%
rename from dlls/d3d10core/inputlayout.c
rename to dlls/d3d11/inputlayout.c
index a1b3274..86bd15d 100644
--- a/dlls/d3d10core/inputlayout.c
+++ b/dlls/d3d11/inputlayout.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d11/layer.c
similarity index 94%
copy from dlls/d3d10core/d3d10core_main.c
copy to dlls/d3d11/layer.c
index 9006d95..0f307de 100644
--- a/dlls/d3d10core/d3d10core_main.c
+++ b/dlls/d3d11/layer.c
@@ -20,8 +20,8 @@
#include "config.h"
#include "wine/port.h"
-#define D3D10CORE_INIT_GUID
-#include "d3d10core_private.h"
+#define D3D11_INIT_GUID
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
@@ -81,7 +81,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba
return S_OK;
}
-HRESULT WINAPI D3D10CoreRegisterLayers(void)
+HRESULT d3d10_core_register_layers(void)
{
const struct dxgi_device_layer layers[] =
{
@@ -93,7 +93,7 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void)
return S_OK;
}
-HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
+HRESULT d3d10_core_create_device(IDXGIFactory *factory, IDXGIAdapter *adapter,
UINT flags, void *unknown0, ID3D10Device **device)
{
IUnknown *dxgi_device;
diff --git a/dlls/d3d10core/shader.c b/dlls/d3d11/shader.c
similarity index 99%
rename from dlls/d3d10core/shader.c
rename to dlls/d3d11/shader.c
index 19586ca..67b60a8 100644
--- a/dlls/d3d10core/shader.c
+++ b/dlls/d3d11/shader.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/state.c b/dlls/d3d11/state.c
similarity index 99%
rename from dlls/d3d10core/state.c
rename to dlls/d3d11/state.c
index c4cf9c1..24091c8 100644
--- a/dlls/d3d10core/state.c
+++ b/dlls/d3d11/state.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/texture.c b/dlls/d3d11/texture.c
similarity index 99%
rename from dlls/d3d10core/texture.c
rename to dlls/d3d11/texture.c
index 5a9319d..100543d 100644
--- a/dlls/d3d10core/texture.c
+++ b/dlls/d3d11/texture.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/utils.c b/dlls/d3d11/utils.c
similarity index 99%
rename from dlls/d3d10core/utils.c
rename to dlls/d3d11/utils.c
index 763cc43..655f63b 100644
--- a/dlls/d3d10core/utils.c
+++ b/dlls/d3d11/utils.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "wine/port.h"
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
diff --git a/dlls/d3d10core/view.c b/dlls/d3d11/view.c
similarity index 99%
rename from dlls/d3d10core/view.c
rename to dlls/d3d11/view.c
index a3492a0..26bd756 100644
--- a/dlls/d3d10core/view.c
+++ b/dlls/d3d11/view.c
@@ -21,7 +21,7 @@
#include "wine/port.h"
#define NONAMELESSUNION
-#include "d3d10core_private.h"
+#include "d3d11_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
--
2.4.6
More information about the wine-patches
mailing list