marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: COM cleanup for the ID3D10PixelShader iface.

oldstable
Michael Stefaniuc 2011-07-12 01:56:39 +02:00 committed by Alexandre Julliard
parent 887a4ff3cc
commit f196050f28
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d10core/d3d10core_private.h
View File

@ -194,7 +194,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
/* ID3D10PixelShader */
struct d3d10_pixel_shader
{
const struct ID3D10PixelShaderVtbl *vtbl;
ID3D10PixelShader ID3D10PixelShader_iface;
LONG refcount;
struct wined3d_shader *wined3d_shader;

2
dlls/d3d10core/device.c
View File

@ -952,7 +952,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if
}
TRACE("Created pixel shader %p.\n", object);
*shader = (ID3D10PixelShader *)object;
*shader = &object->ID3D10PixelShader_iface;
return S_OK;
}

8
dlls/d3d10core/shader.c
View File

@ -421,7 +421,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, vtbl);
return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface);
}
/* IUnknown methods */
@ -448,7 +448,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh
static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface)
{
struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface;
struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount);
@ -461,7 +461,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac
static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface)
{
struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface;
struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount);
@ -536,7 +536,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_
struct d3d10_shader_info shader_info;
HRESULT hr;
shader->vtbl = &d3d10_pixel_shader_vtbl;
shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl;
shader->refcount = 1;
shader_info.output_signature = &shader->output_signature;