fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 21:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/main: remove ARB suffix from glGetnTexImage

Browse source 
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 <erik.faye-lund@collabora.com>
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
This commit is contained in:
Erik Faye-Lund 2018-11-21 20:09:46 +01:00
parent f5d053702f
commit f1998e15ff
4 changed files with 15 additions and 6 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">
<function name="GetnTexImageARB" alias="GetnTexImage">
<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,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"/>

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

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

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