From ccf2ff7089b71161a272c4dcd5424df757963eaf Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 17 Jun 2011 21:00:04 +0200 Subject: [PATCH] d3d8: Implement IDirect3DCubeTexture8 private data handling on top of wined3d_resource. --- dlls/d3d8/cubetexture.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 304508b8226..6b8caf1c398 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -109,13 +109,15 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(IDirect3DCubeText REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); - hr = wined3d_texture_set_private_data(This->wined3d_texture, refguid, pData, SizeOfData, Flags); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_set_private_data(resource, refguid, pData, SizeOfData, Flags); wined3d_mutex_unlock(); return hr; @@ -125,13 +127,15 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(IDirect3DCubeText REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); - hr = wined3d_texture_get_private_data(This->wined3d_texture, refguid, pData, pSizeOfData); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_get_private_data(resource, refguid, pData, pSizeOfData); wined3d_mutex_unlock(); return hr; @@ -141,12 +145,14 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(IDirect3DCubeTex REFGUID refguid) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); - hr = wined3d_texture_free_private_data(This->wined3d_texture, refguid); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_free_private_data(resource, refguid); wined3d_mutex_unlock(); return hr;