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

d3d10core: COM cleanup for the ID3D10Texture3D iface.

This commit is contained in:
Michael Stefaniuc 2011-06-01 10:16:55 +02:00 committed by Alexandre Julliard
parent 7d295ddfa4
commit a8712d5522
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d10core/d3d10core_private.h
View File

@ -98,7 +98,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
/* ID3D10Texture3D */ /* ID3D10Texture3D */
struct d3d10_texture3d struct d3d10_texture3d
{ {
const struct ID3D10Texture3DVtbl *vtbl; ID3D10Texture3D ID3D10Texture3D_iface;
LONG refcount; LONG refcount;
struct wined3d_texture *wined3d_texture; struct wined3d_texture *wined3d_texture;

2
dlls/d3d10core/device.c
View File

@ -713,7 +713,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac
} }
TRACE("Created 3D texture %p.\n", object); TRACE("Created 3D texture %p.\n", object);
*texture = (ID3D10Texture3D *)object; *texture = &object->ID3D10Texture3D_iface;
return S_OK; return S_OK;
} }

17
dlls/d3d10core/texture.c
View File

@ -251,6 +251,11 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
return S_OK; return S_OK;
} }
static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface);
}
static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object)
{ {
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
@ -273,7 +278,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D
static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface)
{ {
struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
ULONG refcount = InterlockedIncrement(&texture->refcount); ULONG refcount = InterlockedIncrement(&texture->refcount);
TRACE("%p increasing refcount to %u.\n", texture, refcount); TRACE("%p increasing refcount to %u.\n", texture, refcount);
@ -291,7 +296,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *pare
static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface)
{ {
struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
ULONG refcount = InterlockedDecrement(&texture->refcount); ULONG refcount = InterlockedDecrement(&texture->refcount);
TRACE("%p decreasing refcount to %u.\n", texture, refcount); TRACE("%p decreasing refcount to %u.\n", texture, refcount);
@ -356,7 +361,7 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3
static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx,
D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture)
{ {
struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
WINED3DLOCKED_BOX wined3d_map_desc; WINED3DLOCKED_BOX wined3d_map_desc;
HRESULT hr; HRESULT hr;
@ -384,7 +389,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN
static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx)
{ {
struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx);
@ -397,7 +402,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT
static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc)
{ {
struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
TRACE("iface %p, desc %p.\n", iface, desc); TRACE("iface %p, desc %p.\n", iface, desc);
@ -435,7 +440,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic
{ {
HRESULT hr; HRESULT hr;
texture->vtbl = &d3d10_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl;
texture->refcount = 1; texture->refcount = 1;
texture->desc = *desc; texture->desc = *desc;