diff options
| author | Emil Velikov <[email protected]> | 2018-12-10 17:54:23 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2019-01-24 18:13:25 +0000 |
| commit | 5a81e8d40edd1dc678b27147234ce285c2a0a392 (patch) | |
| tree | 4988f27f8c81ae3908a892f63c5f877ea30fdbbe | |
| parent | 6148cce388f42739e06124b4c5c9d535e6fd1af8 (diff) | |
Revert "mesa/main: remove ARB suffix from glGetnTexImage"
This reverts commit f1998e15ffccf260552bf559abe1a733a8ce990e.
This changes the ABI, such that glGetnTexImageARB entry-point from the
GLAPI gets removed. Thus accessing many functions by offset (as we do)
will result in getting the wrong one.
Follow-up work will swap the by-offset handling, but for now revert
this patch.
Acked-by: Erik Faye-Lund <[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, 6 insertions, 15 deletions
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mapi/glapi/gen/ARB_robustness.xml index 47c417390df..1f6ac4696b6 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" alias="GetnTexImage"> + <function name="GetnTexImageARB"> <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 f4d0808f13b..929e5f6b024 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2817,15 +2817,6 @@ <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 dabfcd06a52..bb4f7006618 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -1440,11 +1440,11 @@ get_texture_image(struct gl_context *ctx, void GLAPIENTRY -_mesa_GetnTexImage(GLenum target, GLint level, GLenum format, GLenum type, - GLsizei bufSize, GLvoid *pixels) +_mesa_GetnTexImageARB(GLenum target, GLint level, GLenum format, GLenum type, + GLsizei bufSize, GLvoid *pixels) { GET_CURRENT_CONTEXT(ctx); - static const char *caller = "glGetnTexImage"; + static const char *caller = "glGetnTexImageARB"; GLsizei width, height, depth; struct gl_texture_object *texObj; diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index 9a5874300e7..3928e7abb7b 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_GetnTexImage(GLenum target, GLint level, GLenum format, - GLenum type, GLsizei bufSize, GLvoid *pixels); +_mesa_GetnTexImageARB( 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); |