H. Verbeet : wined3d: The second parameter to glTexImage3DEXT isn' t a GLenum.

[Alexandre Julliard]

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

Author: H. Verbeet 
Date:   Mon Apr 23 22:03:04 2007 +0200

wined3d: The second parameter to glTexImage3DEXT isn't a GLenum.

---

dlls/wined3d/volume.c            |    2 +-
 dlls/wined3d/volumetexture.c     |    2 +-
 include/wine/wined3d_interface.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index c50e489..f0ea113 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -262,7 +262,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWi
     return WINED3D_OK;
 }

-static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, GLenum gl_level) {
+static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level) {
     IWineD3DVolumeImpl *This     = (IWineD3DVolumeImpl *)iface;
     WINED3DFORMAT format = This->resource.format;
     const PixelFormatDesc *formatEntry = getFormatDescEntry(format);
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 1d75bdc..2b26eb3 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -92,7 +92,7 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture

static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *iface) {
     /* Overrider the IWineD3DResource Preload method */
-    UINT i;
+    int i;
     IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;
     IWineD3DDeviceImpl *device = This->resource.wineD3DDevice;

diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 85653a4..cf4a1de 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -1209,7 +1209,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource)
     STDMETHOD(UnlockBox)(THIS) PURE;
     STDMETHOD(AddDirtyBox)(THIS_ CONST WINED3DBOX* pDirtyBox) PURE;
     STDMETHOD(CleanDirtyBox)(THIS) PURE;
-    STDMETHOD(LoadTexture)(THIS_ UINT gl_level) PURE;
+    STDMETHOD(LoadTexture)(THIS_ int gl_level) PURE;
     STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE;
 };
 #undef INTERFACE