mesa: Fix error in target validation of glCompressedTex(ture)SubImage3D() calls
Basically, two different target error checks are chained consecutively, and the second one is executed regardless the result of the first one. This produces an incorrect error if the first check fails but is overrided by the second. This patch conditions the execution of the second check to a successful pass of the first one. Fixes 1 dEQP test: * dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
This commit is contained in:
@@ -4586,7 +4586,8 @@ compressed_subtexture_target_check(struct gl_context *ctx, GLenum target,
|
||||
* are valid here, which they are not, but of course not mentioned by
|
||||
* core spec.
|
||||
*/
|
||||
if (target != GL_TEXTURE_2D_ARRAY && target != GL_TEXTURE_CUBE_MAP_ARRAY) {
|
||||
if (targetOK && target != GL_TEXTURE_2D_ARRAY &&
|
||||
target != GL_TEXTURE_CUBE_MAP_ARRAY) {
|
||||
bool invalidformat;
|
||||
switch (format) {
|
||||
/* These came from _mesa_is_compressed_format in glformats.c. */
|
||||
|
||||
Reference in New Issue
Block a user