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

mesa: Emit errors for inconsistent compressed pixel store state

Browse source 
V2: Use bool rather than GLboolean for internal function

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Chris Forbes 2014-05-20 23:41:59 +12:00
parent 75a5823749
commit d6e60cb504
3 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/texgetimage.c
View file

@ -963,7 +963,7 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj;
struct gl_texture_image *texImage;
const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
GLuint compressedSize;
GLuint compressedSize, dimensions;
if (!legal_getteximage_target(ctx, target)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImage(target=0x%x)",
@ -1004,6 +1004,14 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target,
texImage->Height,
texImage->Depth);
/* Check for invalid pixel storage modes */
dimensions = _mesa_get_texture_dimensions(texImage->TexObject->Target);
if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dimensions,
&ctx->Pack,
"glGetCompressedTexImageARB")) {
return GL_TRUE;
}
if (!_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
/* do bounds checking on writing to client memory */
if (clientMemSize < (GLsizei) compressedSize) {

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

@ -2242,6 +2242,36 @@ texture_error_check( struct gl_context *ctx,
}
bool
_mesa_compressed_texture_pixel_storage_error_check(struct gl_context *ctx,
GLint dimensions,
struct gl_pixelstore_attrib *packing,
const char *caller)
{
if (!_mesa_is_desktop_gl(ctx) || !packing->CompressedBlockSize)
return true;
if (packing->CompressedBlockWidth && packing->SkipPixels % packing->CompressedBlockWidth) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(skip-pixels %% block-width)", caller);
return false;
}
if (dimensions > 1 && packing->CompressedBlockHeight && packing->SkipRows % packing->CompressedBlockHeight) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(skip-rows %% block-height)", caller);
return false;
}
if (dimensions > 2 && packing->CompressedBlockDepth && packing->SkipImages % packing->CompressedBlockDepth) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(skip-images %% block-depth)", caller);
return false;
}
return true;
}
/**
* Error checking for glCompressedTexImage[123]D().
* Note that the width, height and depth values are not fully error checked
@ -2343,6 +2373,13 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
goto error;
}
/* Check for invalid pixel storage modes */
if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dimensions,
&ctx->Unpack,
"glCompressedTexImage")) {
return GL_FALSE;
}
/* check image size in bytes */
if (expectedSize != imageSize) {
/* Per GL_ARB_texture_compression: GL_INVALID_VALUE is generated [...]
@ -3862,6 +3899,14 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
return GL_TRUE;
}
/* Check for invalid pixel storage modes */
if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dims,
&ctx->Unpack,
"glCompressedTexSubImage")) {
return GL_FALSE;
}
expectedSize = compressed_tex_size(width, height, depth, format);
if (expectedSize != imageSize) {
_mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage%uD(size=%d)",

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

@ -326,6 +326,12 @@ _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
GLsizei height, GLsizei depth,
GLboolean fixedsamplelocations);
bool
_mesa_compressed_texture_pixel_storage_error_check(struct gl_context *ctx,
GLint dimensions,
struct gl_pixelstore_attrib *packing,
const char *caller);
/*@}*/
#ifdef __cplusplus