Henri Verbeet : d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 732338ab356991b2fb245f04fd0497a2bc7087e1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=732338ab356991b2fb245f04fd0497a2bc7087e1

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jun 17 21:00:01 2011 +0200

d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource.

---

 dlls/d3d9/cubetexture.c   |   12 +++++++++---
 dlls/wined3d/texture.c    |    7 +++++++
 dlls/wined3d/wined3d.spec |    1 +
 include/wine/wined3d.h    |    1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index a4b07f0..bc29035 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -112,13 +112,15 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(IDirect3DCubeText
         REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags)
 {
     IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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;
@@ -128,13 +130,15 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(IDirect3DCubeText
         REFGUID refguid, void *pData, DWORD *pSizeOfData)
 {
     IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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;
@@ -144,12 +148,14 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(IDirect3DCubeTex
         REFGUID refguid)
 {
     IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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;
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 72d0d4a..2ca32a0 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -450,6 +450,13 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture)
     return refcount;
 }
 
+struct wined3d_resource * CDECL wined3d_texture_get_resource(struct wined3d_texture *texture)
+{
+    TRACE("texture %p.\n", texture);
+
+    return &texture->resource;
+}
+
 HRESULT CDECL wined3d_texture_set_private_data(struct wined3d_texture *texture,
         REFGUID guid, const void *data, DWORD data_size, DWORD flags)
 {
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index ab8d943..3391089 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -267,6 +267,7 @@
 @ cdecl wined3d_texture_get_parent(ptr)
 @ cdecl wined3d_texture_get_priority(ptr)
 @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr)
+@ cdecl wined3d_texture_get_resource(ptr)
 @ cdecl wined3d_texture_get_sub_resource(ptr long)
 @ cdecl wined3d_texture_incref(ptr)
 @ cdecl wined3d_texture_preload(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index fccdaf3..93f864a 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2504,6 +2504,7 @@ void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture)
 DWORD __cdecl wined3d_texture_get_priority(const struct wined3d_texture *texture);
 HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *texture,
         REFGUID guid, void *data, DWORD *data_size);
+struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture);
 struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture,
         UINT sub_resource_idx);
 ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture);