ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Do not store ID3D11Device pointer in d3d11_immediate_context. 

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>
This commit is contained in:
Józef Kucia 2015-10-23 02:38:14 +02:00 committed by Alexandre Julliard
parent 3b02ae89a8
commit 1861131090
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d11/d3d11_private.h
View File

@ -370,7 +370,6 @@ struct d3d11_immediate_context
{ {
ID3D11DeviceContext ID3D11DeviceContext_iface; ID3D11DeviceContext ID3D11DeviceContext_iface;
LONG refcount; LONG refcount;
ID3D11Device *device;
}; };
/* ID3D11Device, ID3D10Device1 */ /* ID3D11Device, ID3D10Device1 */

13
dlls/d3d11/device.c
View File

@ -67,13 +67,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext *iface) static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext *iface)
{ {
struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface);
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
ULONG refcount = InterlockedIncrement(&context->refcount); ULONG refcount = InterlockedIncrement(&context->refcount);
TRACE("%p increasing refcount to %u.\n", context, refcount); TRACE("%p increasing refcount to %u.\n", context, refcount);
if (refcount == 1) if (refcount == 1)
{ {
ID3D11Device_AddRef(context->device); ID3D11Device_AddRef(&device->ID3D11Device_iface);
} }
return refcount; return refcount;
@ -82,13 +83,14 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContex
static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceContext *iface) static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceContext *iface)
{ {
struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface);
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
ULONG refcount = InterlockedDecrement(&context->refcount); ULONG refcount = InterlockedDecrement(&context->refcount);
TRACE("%p decreasing refcount to %u.\n", context, refcount); TRACE("%p decreasing refcount to %u.\n", context, refcount);
if (!refcount) if (!refcount)
{ {
ID3D11Device_Release(context->device); ID3D11Device_Release(&device->ID3D11Device_iface);
} }
return refcount; return refcount;
@ -96,11 +98,11 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte
static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext *iface, ID3D11Device **device) static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext *iface, ID3D11Device **device)
{ {
struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext(iface);
TRACE("iface %p, device %p.\n", iface, device); TRACE("iface %p, device %p.\n", iface, device);
*device = context->device; *device = &device_object->ID3D11Device_iface;
ID3D11Device_AddRef(*device); ID3D11Device_AddRef(*device);
} }
@ -1057,8 +1059,7 @@ static HRESULT d3d11_immediate_context_init(struct d3d11_immediate_context *cont
context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl;
context->refcount = 1; context->refcount = 1;
context->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(&device->ID3D11Device_iface);
ID3D11Device_AddRef(context->device);
return S_OK; return S_OK;
} }