mesa: fix texture storage multisample prototypes harder.
authorDave Airlie <airlied@redhat.com>
Mon, 1 Apr 2013 09:53:55 +0000 (19:53 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Apr 2013 09:54:56 +0000 (19:54 +1000)
I just noticed the warnings since I fixed the other bit.

Signed-off-by: Dave Airlie <airlied@redhat.com>
src/mesa/main/teximage.c
src/mesa/main/teximage.h

index ccdb95a67d8b8f3fe66914211c52b808724fc0f6..784b389a7f4ff15b0d0a99185eb4a0f8c2d96f67 100644 (file)
@@ -4348,7 +4348,7 @@ _mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
 
 void GLAPIENTRY
 _mesa_TexStorage2DMultisample(GLenum target, GLsizei samples,
-                              GLint internalformat, GLsizei width,
+                              GLenum internalformat, GLsizei width,
                               GLsizei height, GLboolean fixedsamplelocations)
 {
    teximagemultisample(2, target, samples, internalformat,
@@ -4357,7 +4357,7 @@ _mesa_TexStorage2DMultisample(GLenum target, GLsizei samples,
 
 void GLAPIENTRY
 _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
-                              GLint internalformat, GLsizei width,
+                              GLenum internalformat, GLsizei width,
                               GLsizei height, GLsizei depth,
                               GLboolean fixedsamplelocations)
 {
index cedd93383553d191a68bb94f97cbeee20426d006..bb295c7a7ff3b668e294769a6ccd12dce7bd6c12 100644 (file)
@@ -307,12 +307,12 @@ _mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
 
 extern void GLAPIENTRY
 _mesa_TexStorage2DMultisample(GLenum target, GLsizei samples,
-                              GLint internalformat, GLsizei width,
+                              GLenum internalformat, GLsizei width,
                               GLsizei height, GLboolean fixedsamplelocations);
 
 extern void GLAPIENTRY
 _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
-                              GLint internalformat, GLsizei width,
+                              GLenum internalformat, GLsizei width,
                               GLsizei height, GLsizei depth,
                               GLboolean fixedsamplelocations);