fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 01:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: consolidate cube width=height error checking

Browse source 
Instead of checking width==height in four places, just do it in
_mesa_legal_texture_dimensions() where we do the other width, height,
depth checks.  Similarly, move the check that cube map array depth is
a multiple of 6.

This change also fixes some missing cube dimension checks for the
glTexStorage[23]D() functions.

Remove width==height assertion in _mesa_get_tex_max_num_levels() since
that's called before the other size checks for glTexStorage.

Cc: "9.2" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Brian Paul 2013-10-14 10:26:41 -06:00
parent 6e444a72c1
commit fa9c702164
1 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1112,7 +1112,6 @@ _mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height,
case GL_TEXTURE_CUBE_MAP_ARRAY:
case GL_PROXY_TEXTURE_CUBE_MAP:
case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
ASSERT(width == height);
size = width;
break;
case GL_TEXTURE_2D:
@ -1447,6 +1446,8 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
maxSize >>= level;
if (width != height)
return GL_FALSE;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
@ -1500,7 +1501,9 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
return GL_FALSE;
if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers || depth % 6)
return GL_FALSE;
if (width != height)
return GL_FALSE;
if (level >= ctx->Const.MaxCubeTextureLevels)
return GL_FALSE;
@ -1991,27 +1994,6 @@ texture_error_check( struct gl_context *ctx,
}
}
if ((target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
_mesa_is_cube_face(target)) && width != height) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glTexImage2D(cube width != height)");
return GL_TRUE;
}
if ((target == GL_PROXY_TEXTURE_CUBE_MAP_ARRAY ||
target == GL_TEXTURE_CUBE_MAP_ARRAY) && width != height) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glTexImage3D(cube array width != height)");
return GL_TRUE;
}
if ((target == GL_PROXY_TEXTURE_CUBE_MAP_ARRAY ||
target == GL_TEXTURE_CUBE_MAP_ARRAY) && (depth % 6)) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glTexImage3D(cube array depth not multiple of 6)");
return GL_TRUE;
}
/* Check internalFormat */
if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
@ -2243,14 +2225,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
goto error;
}
/* For cube map, width must equal height */
if ((target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
_mesa_is_cube_face(target)) && width != height) {
reason = "width != height";
error = GL_INVALID_VALUE;
goto error;
}
/* check image size in bytes */
if (expectedSize != imageSize) {
/* Per GL_ARB_texture_compression: GL_INVALID_VALUE is generated [...]
@ -2596,13 +2570,6 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
}
}
if ((target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
_mesa_is_cube_face(target)) && width != height) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glTexImage2D(cube width != height)");
return GL_TRUE;
}
if (_mesa_is_compressed_format(ctx, internalFormat)) {
if (!target_can_be_compressed(ctx, target, internalFormat)) {
_mesa_error(ctx, GL_INVALID_ENUM,