diff options
| author | Brian Paul <[email protected]> | 2013-10-16 08:43:21 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-10-16 08:43:23 -0600 |
| commit | 2273b04c6198d591c3dc5123c4d100da5bcc0e18 (patch) | |
| tree | 3c85a24952ea05fa2512f0b40bcf3a55e9dd39a5 | |
| parent | 4f08cdefda8f1c99a7e197f6887fbfa275fa35c0 (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.
| -rw-r--r-- | src/mapi/glapi/gen/ARB_texture_multisample.xml | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mapi/glapi/gen/ARB_texture_multisample.xml index f0dd4f5f79b..1f65a8bcf80 100644 --- a/src/mapi/glapi/gen/ARB_texture_multisample.xml +++ b/src/mapi/glapi/gen/ARB_texture_multisample.xml @@ -37,7 +37,7 @@ <function name="TexImage2DMultisample" offset="assign"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> - <param name="internalformat" type="GLint"/> + <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="fixedsamplelocations" type="GLboolean"/> @@ -46,7 +46,7 @@ <function name="TexImage3DMultisample" offset="assign"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> - <param name="internalformat" type="GLint"/> + <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> 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); |