From a989afe364767f287a30a55db1f3ea9c13dad466 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 17 Jun 2011 21:00:02 +0200 Subject: [PATCH] d3d9: Implement IDirect3DTexture9 private data handling on top of wined3d_resource. --- dlls/d3d9/texture.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 970028b87c2..b0ccd6f5e77 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -108,13 +108,15 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(IDirect3DTexture9 *if REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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; @@ -124,13 +126,15 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(IDirect3DTexture9 *if REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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; @@ -140,12 +144,14 @@ static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(IDirect3DTexture9 *i REFGUID refguid) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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;