Module: Mesa Branch: master Commit: 135bb3c1a92d424401c34d69ef35f241db64cd22 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=135bb3c1a92d424401c34d69ef35f241db64cd22
Author: Dave Airlie <[email protected]> Date: Mon Apr 1 19:53:55 2013 +1000 mesa: fix texture storage multisample prototypes harder. I just noticed the warnings since I fixed the other bit. Signed-off-by: Dave Airlie <[email protected]> --- src/mesa/main/teximage.c | 4 ++-- src/mesa/main/teximage.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index ccdb95a..784b389 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -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) { diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index cedd933..bb295c7 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
