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

mesa: add KHR_no_error support for glCompressedTex*SubImage2D()

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri 2017-05-11 22:16:07 +10:00
parent 1b36aa02b0
commit 7cc190aae8
4 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -420,7 +420,7 @@
<param name="data" type="const GLvoid *" />
</function>
<function name="CompressedTextureSubImage2D">
<function name="CompressedTextureSubImage2D" no_error="true">
<param name="texture" type="GLuint" />
<param name="level" type="GLint" />
<param name="xoffset" type="GLint" />

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

@ -4558,7 +4558,8 @@
<glx rop="219" handcode="client"/>
</function>
<function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" marshal="sync">
<function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" marshal="sync"
no_error="true">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
<param name="xoffset" type="GLint"/>

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

@ -4627,6 +4627,19 @@ _mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
"glCompressedTextureSubImage1D");
}
void GLAPIENTRY
_mesa_CompressedTexSubImage2D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data)
{
compressed_tex_sub_image(2, target, 0, level, xoffset, yoffset, width,
height, format, imageSize, data, false, true,
"glCompressedTexSubImage2D");
}
void GLAPIENTRY
_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
@ -4638,6 +4651,20 @@ _mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
"glCompressedTexSubImage2D");
}
void GLAPIENTRY
_mesa_CompressedTextureSubImage2D_no_error(GLuint texture, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data)
{
compressed_tex_sub_image(2, 0, texture, level, xoffset, yoffset, width,
height, format, imageSize, data, true, true,
"glCompressedTextureSubImage2D");
}
void GLAPIENTRY
_mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
GLint yoffset,

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

@ -408,12 +408,24 @@ _mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset,
GLsizei imageSize, const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexSubImage2D_no_error(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTextureSubImage2D_no_error(GLuint texture, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset,
GLint yoffset,
GLsizei width, GLsizei height,