commit 756fdb7c5affaef02d058c388e15fe1ce183ee38
author Henri Verbeet <hverbeet@codeweavers.com> Tue Mar 08 19:41:05 2011 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Mar 09 12:28:58 2011 +0100
tree 57a88b01d6cd5b9352913509b68603132308c57e
parent 1913ff3a42d2f26460cd39ac749435abfe9e3d62

wined3d: Merge the various resource desc structures.

dlls/d3d9/buffer.c

diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 77234f8..a3bf3db 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -211,7 +211,7 @@
 static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D3DVERTEXBUFFER_DESC *desc)
 {
     IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface;
-    WINED3DBUFFER_DESC wined3d_desc;
+    struct wined3d_resource_desc wined3d_desc;
 
     TRACE("iface %p, desc %p.\n", iface, desc);
 
@@ -220,9 +220,9 @@
     wined3d_mutex_unlock();
 
     desc->Format = D3DFMT_VERTEXDATA;
-    desc->Usage = wined3d_desc.Usage;
-    desc->Pool = wined3d_desc.Pool;
-    desc->Size = wined3d_desc.Size;
+    desc->Usage = wined3d_desc.usage;
+    desc->Pool = wined3d_desc.pool;
+    desc->Size = wined3d_desc.size;
     desc->Type = D3DRTYPE_VERTEXBUFFER;
     desc->FVF = buffer->fvf;
 
@@ -473,7 +473,7 @@
 static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3DINDEXBUFFER_DESC *desc)
 {
     IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface;
-    WINED3DBUFFER_DESC wined3d_desc;
+    struct wined3d_resource_desc wined3d_desc;
 
     TRACE("iface %p, desc %p.\n", iface, desc);
 
@@ -482,9 +482,9 @@
     wined3d_mutex_unlock();
 
     desc->Format = d3dformat_from_wined3dformat(buffer->format);
-    desc->Usage = wined3d_desc.Usage;
-    desc->Pool = wined3d_desc.Pool;
-    desc->Size = wined3d_desc.Size;
+    desc->Usage = wined3d_desc.usage;
+    desc->Pool = wined3d_desc.pool;
+    desc->Size = wined3d_desc.size;
     desc->Type = D3DRTYPE_INDEXBUFFER;
 
     return D3D_OK;