KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mesa/main: remove ARB suffix from glGetnTexImage" 

This reverts commit f1998e15ff.

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 <erik.faye-lund@collabora.com>
This commit is contained in:
Emil Velikov 2018-12-10 17:54:23 +00:00
parent 6148cce388
commit 5a81e8d40e
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_robustness.xml
View File

@ -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"/>

9
src/mapi/glapi/gen/gl_API.xml
View File

@ -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"/>

6
src/mesa/main/texgetimage.c
View File

@ -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;

4
src/mesa/main/texgetimage.h
View File

@ -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);