Rémi Bernon : d3d10core: Directly call DXGID3D10CreateDevice().
Alexandre Julliard
julliard at winehq.org
Tue Jun 2 16:34:10 CDT 2020
Module: wine
Branch: master
Commit: a5a1bcbdaf981ba34e833f62f1bbb6530ee6dcd9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a1bcbdaf981ba34e833f62f1bbb6530ee6dcd9
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Tue Jun 2 04:05:04 2020 +0430
d3d10core: Directly call DXGID3D10CreateDevice().
Instead of using D3D11CoreCreateDevice().
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d10core/Makefile.in | 2 +-
dlls/d3d10core/d3d10core_main.c | 23 +++++++++++++++--------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in
index cf7efb2741..e56e38c188 100644
--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@@ -1,6 +1,6 @@
MODULE = d3d10core.dll
IMPORTLIB = d3d10core
-IMPORTS = d3d11
+IMPORTS = d3d11 dxgi
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c
index d364be90d6..bbfa4e691a 100644
--- a/dlls/d3d10core/d3d10core_main.c
+++ b/dlls/d3d10core/d3d10core_main.c
@@ -22,12 +22,12 @@
#include "initguid.h"
#define COBJMACROS
-#include "d3d11.h"
+#include "d3d10.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
-HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags,
- const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device);
+HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d11, IDXGIFactory *factory, IDXGIAdapter *adapter,
+ unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device);
HRESULT WINAPI D3D10CoreRegisterLayers(void)
{
@@ -39,20 +39,27 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void)
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device)
{
- ID3D11Device *device11;
+ IUnknown *dxgi_device;
+ HMODULE d3d11;
HRESULT hr;
TRACE("factory %p, adapter %p, flags %#x, feature_level %#x, device %p.\n",
factory, adapter, flags, feature_level, device);
- if (FAILED(hr = D3D11CoreCreateDevice(factory, adapter, flags, &feature_level, 1, &device11)))
+ d3d11 = LoadLibraryA("d3d11.dll");
+ hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, &feature_level, 1, (void **)&dxgi_device);
+ FreeLibrary(d3d11);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create device, hr %#x.\n", hr);
return hr;
+ }
- hr = ID3D11Device_QueryInterface(device11, &IID_ID3D10Device, (void **)device);
- ID3D11Device_Release(device11);
+ hr = IUnknown_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)device);
+ IUnknown_Release(dxgi_device);
if (FAILED(hr))
{
- ERR("Device should implement ID3D10Device, returning E_FAIL.\n");
+ ERR("Failed to query ID3D10Device interface, returning E_FAIL.\n");
return E_FAIL;
}
More information about the wine-cvs
mailing list