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

d3d11: Implement d3d11_immediate_context_OMGetDepthStencilState(). 

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 2016-07-04 12:26:21 +02:00 committed by Alexandre Julliard
parent fd4f1d9c48
commit 006ff5aa3a
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d11/d3d11_private.h
View File

@ -382,6 +382,11 @@ struct d3d_depthstencil_state
ID3D11Device *device; ID3D11Device *device;
}; };
static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface)
{
return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface);
}
HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device,
const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN;
struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState(

22
dlls/d3d11/device.c
View File

@ -1671,7 +1671,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi
static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface,
ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref)
{ {
FIXME("iface %p, depth_stencil_state %p, stencil_ref %p stub!\n", iface, depth_stencil_state, stencil_ref); struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n",
iface, depth_stencil_state, stencil_ref);
if ((*depth_stencil_state = device->depth_stencil_state
? &device->depth_stencil_state->ID3D11DepthStencilState_iface : NULL))
ID3D11DepthStencilState_AddRef(*depth_stencil_state);
*stencil_ref = device->stencil_ref;
} }
static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface, static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface,
@ -4090,14 +4098,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1
ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref)
{ {
struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_device *device = impl_from_ID3D10Device(iface);
ID3D11DepthStencilState *d3d11_iface;
TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n",
iface, depth_stencil_state, stencil_ref); iface, depth_stencil_state, stencil_ref);
if ((*depth_stencil_state = device->depth_stencil_state d3d11_immediate_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface,
? &device->depth_stencil_state->ID3D10DepthStencilState_iface : NULL)) &d3d11_iface, stencil_ref);
ID3D10DepthStencilState_AddRef(*depth_stencil_state);
*stencil_ref = device->stencil_ref; if (d3d11_iface)
*depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface;
else
*depth_stencil_state = NULL;
} }
static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface,

5
dlls/d3d11/state.c
View File

@ -328,11 +328,6 @@ struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *ifac
/* ID3D11DepthStencilState methods */ /* 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, static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_QueryInterface(ID3D11DepthStencilState *iface,
REFIID riid, void **object) REFIID riid, void **object)
{ {