Ivan Gyurdiev : wined3d: Initialize volume format.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 257692e087ce5655a571a810d2941a3797767152
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=257692e087ce5655a571a810d2941a3797767152

Author: Ivan Gyurdiev <ivg2 at cornell.edu>
Date:   Wed May 10 13:55:02 2006 -0400

wined3d: Initialize volume format.

---

 dlls/wined3d/volume.c          |   12 ++++++------
 dlls/wined3d/wined3d_private.h |    9 ++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index e8eaa0d..b6b435b 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -291,23 +291,23 @@ HRESULT WINAPI IWineD3DVolumeImpl_LoadTe
     TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n",
             GL_TEXTURE_3D,
             gl_level,
-            D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format),
+            D3DFmt2GLIntFmt(myDevice, This->resource.format),
             This->currentDesc.Width,
             This->currentDesc.Height,
             This->currentDesc.Depth,
             0,
-            D3DFmt2GLFmt(myDevice, This->currentDesc.Format),
-            D3DFmt2GLType(myDevice, This->currentDesc.Format),
+            D3DFmt2GLFmt(myDevice, This->resource.format),
+            D3DFmt2GLType(myDevice, This->resource.format),
             This->resource.allocatedMemory);
     glTexImage3D(GL_TEXTURE_3D,
                     gl_level,
-                    D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format),
+                    D3DFmt2GLIntFmt(myDevice, This->resource.format),
                     This->currentDesc.Width,
                     This->currentDesc.Height,
                     This->currentDesc.Depth,
                     0,
-                    D3DFmt2GLFmt(myDevice, This->currentDesc.Format),
-                    D3DFmt2GLType(myDevice, This->currentDesc.Format),
+                    D3DFmt2GLFmt(myDevice, This->resource.format),
+                    D3DFmt2GLType(myDevice, This->resource.format),
                     This->resource.allocatedMemory);
     checkGLcall("glTexImage3D");
     return WINED3D_OK;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d978604..6a894eb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -734,6 +734,13 @@ typedef struct IWineD3DCubeTextureImpl
 
 extern const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl;
 
+typedef struct _WINED3DVOLUMET_DESC
+{
+    UINT                    Width;
+    UINT                    Height;
+    UINT                    Depth;
+} WINED3DVOLUMET_DESC;
+
 /*****************************************************************************
  * IWineD3DVolume implementation structure (extends IUnknown)
  */
@@ -744,7 +751,7 @@ typedef struct IWineD3DVolumeImpl
     IWineD3DResourceClass      resource;
 
     /* WineD3DVolume Information */
-    D3DVOLUME_DESC          currentDesc;
+    WINED3DVOLUMET_DESC      currentDesc;
     IWineD3DBase            *container;
     UINT                    bytesPerPixel;