aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-10-16 08:43:21 -0600
committerBrian Paul <[email protected]>2013-10-16 08:43:23 -0600
commit2273b04c6198d591c3dc5123c4d100da5bcc0e18 (patch)
tree3c85a24952ea05fa2512f0b40bcf3a55e9dd39a5 /src/mesa/main
parent4f08cdefda8f1c99a7e197f6887fbfa275fa35c0 (diff)
mesa: change glTexImage[23]DMultisample() internalformat to GLenum
To match glext.h and the GL_ARB_texture_multisample extension. However, the GL 4.0 spec and man page say it's GLint. An OpenGL spec bug will be filed.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/teximage.c4
-rw-r--r--src/mesa/main/teximage.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ea2f15bfee0..793c5d38282 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4355,7 +4355,7 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
void GLAPIENTRY
_mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
- GLint internalformat, GLsizei width,
+ GLenum internalformat, GLsizei width,
GLsizei height, GLboolean fixedsamplelocations)
{
teximagemultisample(2, target, samples, internalformat,
@@ -4366,7 +4366,7 @@ _mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
void GLAPIENTRY
_mesa_TexImage3DMultisample(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 88952471892..792383d2fe0 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -296,12 +296,12 @@ _mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
extern void GLAPIENTRY
_mesa_TexImage2DMultisample(GLenum target, GLsizei samples,
- GLint internalformat, GLsizei width,
+ GLenum internalformat, GLsizei width,
GLsizei height, GLboolean fixedsamplelocations);
extern void GLAPIENTRY
_mesa_TexImage3DMultisample(GLenum target, GLsizei samples,
- GLint internalformat, GLsizei width,
+ GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth,
GLboolean fixedsamplelocations);