Module: wine Branch: master Commit: 25ad11cef766eeb6706363e299e5885d6996ae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ad11cef766eeb6706363e299...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Apr 14 12:20:22 2016 +0200
dxgi: Store IDXGIAdapter in IDXGIDevice.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dxgi/device.c | 35 ++++++++++++++++++----------------- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 0c82383..f5de698 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -72,21 +72,23 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface)
static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedDecrement(&device->refcount);
- TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount);
if (!refcount) { - if (This->child_layer) IUnknown_Release(This->child_layer); + if (device->child_layer) + IUnknown_Release(device->child_layer); wined3d_mutex_lock(); - wined3d_device_uninit_3d(This->wined3d_device); - wined3d_device_decref(This->wined3d_device); + wined3d_device_uninit_3d(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - IDXGIFactory1_Release(This->factory); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + IDXGIAdapter1_Release(device->adapter); + IDXGIFactory1_Release(device->factory); + wined3d_private_store_cleanup(&device->private_store); + HeapFree(GetProcessHeap(), 0, device); }
return refcount; @@ -148,16 +150,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R
static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - struct wined3d_device_creation_parameters create_parameters; + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
- TRACE("iface %p, adapter %p\n", iface, adapter); + TRACE("iface %p, adapter %p.\n", iface, adapter);
- wined3d_mutex_lock(); - wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - wined3d_mutex_unlock(); - - return IDXGIFactory1_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); + *adapter = (IDXGIAdapter *)device->adapter; + IDXGIAdapter_AddRef(*adapter); + return S_OK; }
static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, @@ -457,6 +456,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l
device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); + device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; + IDXGIAdapter1_AddRef(device->adapter);
return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a4ed850..7c81900 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_device struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; IDXGIFactory1 *factory; + IDXGIAdapter1 *adapter; };
HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer,