d3d10core: COM cleanup for the ID3D10RasterizerState iface.

This commit is contained in:
Michael Stefaniuc 2011-06-02 11:22:49 +02:00 committed by Alexandre Julliard
parent 815470e68b
commit 54ac05a871
3 changed files with 10 additions and 5 deletions

View File

@ -227,7 +227,7 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DE
/* ID3D10RasterizerState */
struct d3d10_rasterizer_state
{
const struct ID3D10RasterizerStateVtbl *vtbl;
ID3D10RasterizerState ID3D10RasterizerState_iface;
LONG refcount;
};

View File

@ -1026,7 +1026,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device
}
TRACE("Created rasterizer state %p.\n", object);
*rasterizer_state = (ID3D10RasterizerState *)object;
*rasterizer_state = &object->ID3D10RasterizerState_iface;
return S_OK;
}

View File

@ -256,6 +256,11 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state)
return S_OK;
}
static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface);
}
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10RasterizerState *iface,
@ -280,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras
static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface)
{
struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface;
struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u.\n", This, refcount);
@ -290,7 +295,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta
static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface)
{
struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface;
struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u.\n", This, refcount);
@ -361,7 +366,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =
HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state)
{
state->vtbl = &d3d10_rasterizer_state_vtbl;
state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;
state->refcount = 1;
return S_OK;