fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-14 22:18:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add KHR_no_error support for glTexSubImage*D()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-06-01 12:43:24 +02:00
parent 7b104d9c50
commit 98d5667f4b
3 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mapi/glapi/gen/gl_API.xml
View file

@ -3299,7 +3299,7 @@
<glx rop="4122"/>
</function>
<function name="TexSubImage1D">
<function name="TexSubImage1D" no_error="true">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
<param name="xoffset" type="GLint"/>
@ -3311,7 +3311,7 @@
<glx rop="4099" large="true"/>
</function>
<function name="TexSubImage2D" es1="1.0" es2="2.0">
<function name="TexSubImage2D" es1="1.0" es2="2.0" no_error="true">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
<param name="xoffset" type="GLint"/>
@ -4025,7 +4025,7 @@
<glx rop="4114" large="true"/>
</function>
<function name="TexSubImage3D" es2="3.0">
<function name="TexSubImage3D" es2="3.0" no_error="true">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
<param name="xoffset" type="GLint"/>

43
src/mesa/main/teximage.c
View file

@ -3413,6 +3413,20 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
}
void GLAPIENTRY
_mesa_TexSubImage1D_no_error(GLenum target, GLint level,
GLint xoffset, GLsizei width,
GLenum format, GLenum type,
const GLvoid *pixels)
{
GET_CURRENT_CONTEXT(ctx);
texsubimage(ctx, 1, target, level,
xoffset, 0, 0,
width, 1, 1,
format, type, pixels);
}
void GLAPIENTRY
_mesa_TexSubImage1D( GLenum target, GLint level,
GLint xoffset, GLsizei width,
@ -3427,6 +3441,21 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
}
void GLAPIENTRY
_mesa_TexSubImage2D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const GLvoid *pixels)
{
GET_CURRENT_CONTEXT(ctx);
texsubimage(ctx, 2, target, level,
xoffset, yoffset, 0,
width, height, 1,
format, type, pixels);
}
void GLAPIENTRY
_mesa_TexSubImage2D( GLenum target, GLint level,
GLint xoffset, GLint yoffset,
@ -3442,6 +3471,20 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
}
void GLAPIENTRY
_mesa_TexSubImage3D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth,
GLenum format, GLenum type,
const GLvoid *pixels)
{
GET_CURRENT_CONTEXT(ctx);
texsubimage(ctx, 3, target, level,
xoffset, yoffset, zoffset,
width, height, depth,
format, type, pixels);
}
void GLAPIENTRY
_mesa_TexSubImage3D( GLenum target, GLint level,

18
src/mesa/main/teximage.h
View file

@ -271,12 +271,24 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
extern void GLAPIENTRY
_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );
void GLAPIENTRY
_mesa_TexSubImage1D_no_error(GLenum target, GLint level, GLint xoffset,
GLsizei width,
GLenum format, GLenum type,
const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLsizei width,
GLenum format, GLenum type,
const GLvoid *pixels );
void GLAPIENTRY
_mesa_TexSubImage2D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TexSubImage2D( GLenum target, GLint level,
@ -285,6 +297,12 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
GLenum format, GLenum type,
const GLvoid *pixels );
void GLAPIENTRY
_mesa_TexSubImage3D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth,
GLenum format, GLenum type,
const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TexSubImage3D( GLenum target, GLint level,