Correcting INVALID_ENUM issue for GLES3.

Similar to prior fix for GLES2, validation now correctly returns INVALID_ENUM instead of shorting out. BUG=angleproject:1168 Change-Id: I8247b0b3520b0f116856049c85606bb44fa24021 Reviewed-on: https://chromium-review.googlesource.com/303472Reviewed-by: Jamie Madill <jmadill@chromium.org> Tryjob-Request: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Tommy Martino <tmartino@chromium.org>

Correcting INVALID_ENUM issue for GLES3.
7c10269d · tmartino · Tommy Martino · 01306fc7 · 7c10269d · 7c10269d
Commit 7c10269d authored Oct 02, 2015 by tmartino Committed by Tommy Martino Oct 05, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

validationES3.cpp src/libANGLE/validationES3.cpp +5 -4

deqp_gles3_test_expectations.txt src/tests/deqp_support/deqp_gles3_test_expectations.txt +0 -3

No files found.
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -393,15 +393,16 @@ bool ValidateES3TexImageParameters(Context *context, GLenum target, GLint level,
    const gl::InternalFormat &actualFormatInfo = gl::GetInternalFormatInfo(actualInternalFormat);
    if (isCompressed)
    {
-        if (!ValidCompressedImageSize(context, actualInternalFormat, width, height))
+        if (!actualFormatInfo.compressed)
        {
-            context->recordError(Error(GL_INVALID_OPERATION));
+            context->recordError(Error(
+                GL_INVALID_ENUM, "internalformat is not a supported compressed internal format."));
            return false;
        }

-        if (!actualFormatInfo.compressed)
+        if (!ValidCompressedImageSize(context, actualInternalFormat, width, height))
        {
-            context->recordError(Error(GL_INVALID_ENUM));
+            context->recordError(Error(GL_INVALID_OPERATION));
            return false;
        }


--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -1098,15 +1098,12 @@
 1101 WIN : dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage_multisample = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.bindtexture = FAIL
-1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedteximage2d_invalid_format = FAIL
-1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedteximage2d_invalid_astc_target = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_neg_level = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_max_level = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage2d_invalid_size = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.teximage3d = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.texsubimage3d = FAIL
-1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedteximage3d = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedteximage3d_invalid_astc_target = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.texture.compressedtexsubimage3d_invalid_buffer_target = FAIL