system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 20:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3d8: Implement IDirect3DTexture8 private data handling on top of wined3d_resource.

Browse source
This commit is contained in:
Henri Verbeet 2011-06-17 21:00:05 +02:00 committed by Alexandre Julliard
parent ccf2ff7089
commit 5b077584d2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/d3d8/texture.c
View file

@ -108,13 +108,15 @@ static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(IDirect3DTexture8 *if
REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags)
{ {
IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface);
struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n",
iface, debugstr_guid(refguid), pData, SizeOfData, Flags); iface, debugstr_guid(refguid), pData, SizeOfData, Flags);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;
@ -124,13 +126,15 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(IDirect3DTexture8 *if
REFGUID refguid, void *pData, DWORD *pSizeOfData) REFGUID refguid, void *pData, DWORD *pSizeOfData)
{ {
IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface);
struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s, data %p, data_size %p.\n", TRACE("iface %p, guid %s, data %p, data_size %p.\n",
iface, debugstr_guid(refguid), pData, pSizeOfData); iface, debugstr_guid(refguid), pData, pSizeOfData);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;
@ -140,12 +144,14 @@ static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(IDirect3DTexture8 *i
REFGUID refguid) REFGUID refguid)
{ {
IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface);
struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid));
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return hr;