fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add KHR_no_error support to glTextureSubImage*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-07-19 15:36:01 +02:00
parent de0b1e5a81
commit 80a845538a
3 changed files with 71 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,7 +374,7 @@
<param name="fixedsamplelocations" type="GLboolean" />
</function>
<function name="TextureSubImage1D">
<function name="TextureSubImage1D" no_error="true">
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="xoffset" type="GLint" />
@ -384,7 +384,7 @@
<param name="pixels" type="const GLvoid *" />
</function>
<function name="TextureSubImage2D">
<function name="TextureSubImage2D" no_error="true">
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="xoffset" type="GLint" />
@ -396,7 +396,7 @@
<param name="pixels" type="const GLvoid *" />
</function>
<function name="TextureSubImage3D">
<function name="TextureSubImage3D" no_error="true">
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="xoffset" type="GLint" />

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

@ -3494,6 +3494,20 @@ texturesubimage_error(struct gl_context *ctx, GLuint dims,
}
static void
texturesubimage_no_error(struct gl_context *ctx, GLuint dims,
GLuint texture, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLsizei width, GLsizei height, GLsizei depth,
GLenum format, GLenum type, const GLvoid *pixels,
const char *callerName)
{
texturesubimage(ctx, dims, texture, level, xoffset, yoffset, zoffset,
width, height, depth, format, type, pixels, callerName,
true);
}
void GLAPIENTRY
_mesa_TexSubImage1D_no_error(GLenum target, GLint level,
GLint xoffset, GLsizei width,
@ -3581,6 +3595,18 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
format, type, pixels, "glTexSubImage3D");
}
void GLAPIENTRY
_mesa_TextureSubImage1D_no_error(GLuint texture, GLint level, GLint xoffset,
GLsizei width, GLenum format, GLenum type,
const GLvoid *pixels)
{
GET_CURRENT_CONTEXT(ctx);
texturesubimage_no_error(ctx, 1, texture, level, xoffset, 0, 0, width, 1, 1,
format, type, pixels, "glTextureSubImage1D");
}
void GLAPIENTRY
_mesa_TextureSubImage1D(GLuint texture, GLint level,
GLint xoffset, GLsizei width,
@ -3593,6 +3619,19 @@ _mesa_TextureSubImage1D(GLuint texture, GLint level,
}
void GLAPIENTRY
_mesa_TextureSubImage2D_no_error(GLuint texture, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const GLvoid *pixels)
{
GET_CURRENT_CONTEXT(ctx);
texturesubimage_no_error(ctx, 2, texture, level, xoffset, yoffset, 0, width,
height, 1, format, type, pixels,
"glTextureSubImage2D");
}
void GLAPIENTRY
_mesa_TextureSubImage2D(GLuint texture, GLint level,
GLint xoffset, GLint yoffset,
@ -3607,6 +3646,19 @@ _mesa_TextureSubImage2D(GLuint texture, GLint level,
}
void GLAPIENTRY
_mesa_TextureSubImage3D_no_error(GLuint texture, 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);
texturesubimage_no_error(ctx, 3, texture, level, xoffset, yoffset, zoffset,
width, height, depth, format, type, pixels,
"glTextureSubImage3D");
}
void GLAPIENTRY
_mesa_TextureSubImage3D(GLuint texture, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,

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

@ -318,12 +318,22 @@ _mesa_TexSubImage3D( GLenum target, GLint level,
GLenum format, GLenum type,
const GLvoid *pixels );
void GLAPIENTRY
_mesa_TextureSubImage1D_no_error(GLuint texture, GLint level, GLint xoffset,
GLsizei width, GLenum format, GLenum type,
const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
GLsizei width,
GLenum format, GLenum type,
const GLvoid *pixels);
void GLAPIENTRY
_mesa_TextureSubImage2D_no_error(GLuint texture, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const GLvoid *pixels);
extern void GLAPIENTRY
_mesa_TextureSubImage2D(GLuint texture, GLint level,
@ -332,6 +342,12 @@ _mesa_TextureSubImage2D(GLuint texture, GLint level,
GLenum format, GLenum type,
const GLvoid *pixels);
void GLAPIENTRY
_mesa_TextureSubImage3D_no_error(GLuint texture, 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_TextureSubImage3D(GLuint texture, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,