diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e8eaa0d953a..b6b435b5c51 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -291,23 +291,23 @@ HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, GLenum gl_l 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 d9786045f6d..6a894eb8fa6 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;