diff options
| author | Timothy Arceri <[email protected]> | 2017-05-11 22:16:07 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 7cc190aae828de97b3669c37229f36ae558f2488 (patch) | |
| tree | f518b6c4015d7dbb5116a9e1927a320df53fd2ff | |
| parent | 1b36aa02b0e1aacad5dc8611265142f92dee9a9f (diff) | |
mesa: add KHR_no_error support for glCompressedTex*SubImage2D()
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 3 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 27 | ||||
| -rw-r--r-- | src/mesa/main/teximage.h | 12 |
4 files changed, 42 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index 4597d3b6d38..21f44b546c9 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -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" /> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 026f74c2a04..755cb311756 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -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"/> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 718af573be8..887740ad35c 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -4628,6 +4628,19 @@ _mesa_CompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, } 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, GLenum format, GLsizei imageSize, @@ -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, diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index 08e01c6641d..6eda7215457 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -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, |