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

d3d11: Implement ID3D11DepthStencilState interface. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
This commit is contained in:
Józef Kucia 2015-10-02 01:31:52 +02:00 committed by Alexandre Julliard
parent ce0c094218
commit 16e570f4a1
2 changed files with 147 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d11/d3d11_private.h
View File

@ -291,16 +291,17 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_devic
const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN;
/* ID3D10DepthStencilState */
/* ID3D11DepthStencilState, ID3D10DepthStencilState */
struct d3d_depthstencil_state
{
ID3D11DepthStencilState ID3D11DepthStencilState_iface;
ID3D10DepthStencilState ID3D10DepthStencilState_iface;
LONG refcount;
struct wined3d_private_store private_store;
D3D10_DEPTH_STENCIL_DESC desc;
struct wine_rb_entry entry;
ID3D10Device1 *device;
ID3D11Device *device;
};
HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device,

179
dlls/d3d11/state.c
View File

@ -192,6 +192,138 @@ struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *if
return impl_from_ID3D10BlendState(iface);
}
/* ID3D11DepthStencilState methods */
static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface)
{
return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface);
}
static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_QueryInterface(ID3D11DepthStencilState *iface,
REFIID riid, void **object)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_ID3D11DepthStencilState)
|| IsEqualGUID(riid, &IID_ID3D11DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
ID3D11DepthStencilState_AddRef(iface);
*object = iface;
return S_OK;
}
if (IsEqualGUID(riid, &IID_ID3D10DepthStencilState)
|| IsEqualGUID(riid, &IID_ID3D10DeviceChild))
{
ID3D10DepthStencilState_AddRef(&state->ID3D10DepthStencilState_iface);
*object = &state->ID3D10DepthStencilState_iface;
return S_OK;
}
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
}
static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStencilState *iface)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount);
return refcount;
}
static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount);
if (!refcount)
{
struct d3d_device *device = impl_from_ID3D11Device(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->depthstencil_states, &state->desc);
ID3D11Device_Release(state->device);
wined3d_private_store_cleanup(&state->private_store);
wined3d_mutex_unlock();
HeapFree(GetProcessHeap(), 0, state);
}
return refcount;
}
static void STDMETHODCALLTYPE d3d11_depthstencil_state_GetDevice(ID3D11DepthStencilState *iface,
ID3D11Device **device)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
TRACE("iface %p, device %p.\n", iface, device);
*device = state->device;
ID3D11Device_AddRef(*device);
}
static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_GetPrivateData(ID3D11DepthStencilState *iface,
REFGUID guid, UINT *data_size, void *data)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return d3d_get_private_data(&state->private_store, guid, data_size, data);
}
static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_SetPrivateData(ID3D11DepthStencilState *iface,
REFGUID guid, UINT data_size, const void *data)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
return d3d_set_private_data(&state->private_store, guid, data_size, data);
}
static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_SetPrivateDataInterface(ID3D11DepthStencilState *iface,
REFGUID guid, const IUnknown *data)
{
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
return d3d_set_private_data_interface(&state->private_store, guid, data);
}
static void STDMETHODCALLTYPE d3d11_depthstencil_state_GetDesc(ID3D11DepthStencilState *iface,
D3D11_DEPTH_STENCIL_DESC *desc)
{
FIXME("iface %p, desc %p stub!\n", iface, desc);
}
static const struct ID3D11DepthStencilStateVtbl d3d11_depthstencil_state_vtbl =
{
/* IUnknown methods */
d3d11_depthstencil_state_QueryInterface,
d3d11_depthstencil_state_AddRef,
d3d11_depthstencil_state_Release,
/* ID3D11DeviceChild methods */
d3d11_depthstencil_state_GetDevice,
d3d11_depthstencil_state_GetPrivateData,
d3d11_depthstencil_state_SetPrivateData,
d3d11_depthstencil_state_SetPrivateDataInterface,
/* ID3D11DepthStencilState methods */
d3d11_depthstencil_state_GetDesc,
};
/* ID3D10DepthStencilState methods */
static inline struct d3d_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface)
{
return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D10DepthStencilState_iface);
@ -202,52 +334,29 @@ static inline struct d3d_depthstencil_state *impl_from_ID3D10DepthStencilState(I
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface,
REFIID riid, void **object)
{
struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface);
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_ID3D10DepthStencilState)
|| IsEqualGUID(riid, &IID_ID3D10DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
IUnknown_AddRef(iface);
*object = iface;
return S_OK;
}
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
return d3d11_depthstencil_state_QueryInterface(&state->ID3D11DepthStencilState_iface, riid, object);
}
static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStencilState *iface)
{
struct d3d_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface);
TRACE("%p increasing refcount to %u.\n", This, refcount);
TRACE("iface %p.\n", iface);
return refcount;
return d3d11_depthstencil_state_AddRef(&state->ID3D11DepthStencilState_iface);
}
static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface)
{
struct d3d_depthstencil_state *state = impl_from_ID3D10DepthStencilState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount);
TRACE("iface %p.\n", iface);
if (!refcount)
{
struct d3d_device *device = impl_from_ID3D10Device(state->device);
wined3d_mutex_lock();
wine_rb_remove(&device->depthstencil_states, &state->desc);
ID3D10Device1_Release(state->device);
wined3d_private_store_cleanup(&state->private_store);
wined3d_mutex_unlock();
HeapFree(GetProcessHeap(), 0, state);
}
return refcount;
return d3d11_depthstencil_state_Release(&state->ID3D11DepthStencilState_iface);
}
/* ID3D10DeviceChild methods */
@ -258,8 +367,7 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthSten
TRACE("iface %p, device %p.\n", iface, device);
*device = (ID3D10Device *)state->device;
ID3D10Device_AddRef(*device);
ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device);
}
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface,
@ -324,6 +432,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl =
HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device,
const D3D10_DEPTH_STENCIL_DESC *desc)
{
state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl;
state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl;
state->refcount = 1;
wined3d_mutex_lock();
@ -339,8 +448,8 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct
}
wined3d_mutex_unlock();
state->device = &device->ID3D10Device1_iface;
ID3D10Device1_AddRef(state->device);
state->device = &device->ID3D11Device_iface;
ID3D11Device_AddRef(state->device);
return S_OK;
}