diff options
| author | Erik Faye-Lund <[email protected]> | 2018-11-21 20:09:46 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2018-11-26 12:29:54 +0100 |
| commit | f1998e15ffccf260552bf559abe1a733a8ce990e (patch) | |
| tree | 8af42f101cb523be000c7bfe2ef6925270be8358 | |
| parent | f5d053702fa976a3112d9c6a2425430365db40f8 (diff) | |
mesa/main: remove ARB suffix from glGetnTexImage
This function has been core since OpenGL 4.3, so naming the
implementation and reporting erros using an ARB-suffix can be
confusing.
Signed-off-by: Erik Faye-Lund <[email protected]>
Reviewed-by: Juan A. Suarez <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_robustness.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 9 | ||||
| -rw-r--r-- | src/mesa/main/texgetimage.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texgetimage.h | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mapi/glapi/gen/ARB_robustness.xml index 1f6ac4696b6..47c417390df 100644 --- a/src/mapi/glapi/gen/ARB_robustness.xml +++ b/src/mapi/glapi/gen/ARB_robustness.xml @@ -73,7 +73,7 @@ <param name="pattern" type="GLubyte *" output="true"/> </function> - <function name="GetnTexImageARB"> + <function name="GetnTexImageARB" alias="GetnTexImage"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="format" type="GLenum"/> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 929e5f6b024..f4d0808f13b 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2817,6 +2817,15 @@ <glx sop="135" dimensions_in_reply="true"/> </function> + <function name="GetnTexImage"> + <param name="target" type="GLenum"/> + <param name="level" type="GLint"/> + <param name="format" type="GLenum"/> + <param name="type" type="GLenum"/> + <param name="bufSize" type="GLsizei"/> + <param name="img" type="GLvoid *" output="true"/> + </function> + <function name="GetTexParameterfv" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 0ab9ed445d6..2f44f94d37b 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -1380,11 +1380,11 @@ get_texture_image(struct gl_context *ctx, void GLAPIENTRY -_mesa_GetnTexImageARB(GLenum target, GLint level, GLenum format, GLenum type, - GLsizei bufSize, GLvoid *pixels) +_mesa_GetnTexImage(GLenum target, GLint level, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *pixels) { GET_CURRENT_CONTEXT(ctx); - static const char *caller = "glGetnTexImageARB"; + static const char *caller = "glGetnTexImage"; GLsizei width, height, depth; struct gl_texture_object *texObj; diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index 3928e7abb7b..9a5874300e7 100644 --- a/src/mesa/main/texgetimage.h +++ b/src/mesa/main/texgetimage.h @@ -56,8 +56,8 @@ extern void GLAPIENTRY _mesa_GetTexImage( GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels ); extern void GLAPIENTRY -_mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format, - GLenum type, GLsizei bufSize, GLvoid *pixels ); +_mesa_GetnTexImage(GLenum target, GLint level, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *pixels); extern void GLAPIENTRY _mesa_GetTextureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels); |