diff options
| author | Timothy Arceri <[email protected]> | 2017-05-12 10:47:14 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 6c8964bf6343592698021f42ed67b776cdab458b (patch) | |
| tree | ba0b116884c6576ee6594efb86014e53ed98efab /src/mesa/main | |
| parent | d1033cd1eb11105730b423723bda5038787145c9 (diff) | |
mesa: add KHR_no_error support for glCompressedTex*SubImage3D()
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/teximage.c | 28 | ||||
| -rw-r--r-- | src/mesa/main/teximage.h | 14 |
2 files changed, 41 insertions, 1 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 2f9ff309428..fed1dad2621 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -4583,7 +4583,7 @@ compressed_tex_sub_image(unsigned dim, GLenum target, GLuint texture, * (See texturesubimage in teximage.c for details on why this check is * performed.) */ - if (!_mesa_cube_level_complete(texObj, level)) { + if (!no_error && !_mesa_cube_level_complete(texObj, level)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glCompressedTextureSubImage3D(cube map incomplete)"); return; @@ -4714,6 +4714,19 @@ _mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, } void GLAPIENTRY +_mesa_CompressedTexSubImage3D_no_error(GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, GLsizei imageSize, + const GLvoid *data) +{ + compressed_tex_sub_image(3, target, 0, level, xoffset, yoffset, zoffset, + width, height, depth, format, imageSize, data, + false, true, "glCompressedTexSubImage3D"); +} + +void GLAPIENTRY _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, @@ -4725,6 +4738,19 @@ _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, } void GLAPIENTRY +_mesa_CompressedTextureSubImage3D_no_error(GLuint texture, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, GLsizei imageSize, + const GLvoid *data) +{ + compressed_tex_sub_image(3, 0, texture, level, xoffset, yoffset, zoffset, + width, height, depth, format, imageSize, data, + true, true, "glCompressedTextureSubImage3D"); +} + +void GLAPIENTRY _mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index 6eda7215457..bc4e235d387 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -433,12 +433,26 @@ _mesa_CompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, const GLvoid *data); extern void GLAPIENTRY +_mesa_CompressedTexSubImage3D_no_error(GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, GLsizei imageSize, + const GLvoid *data); +extern void GLAPIENTRY _mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY +_mesa_CompressedTextureSubImage3D_no_error(GLuint texture, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, GLsizei imageSize, + const GLvoid *data); +extern void GLAPIENTRY _mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, |