Enable ASTC 3D Textures

Enable ASTC 3D textures. ETC are still unsupported, since dEQP fails if we indicate support. Bug: angleproject:3188 Test: dEQP.KHR_GLES2/texture_3d_compressed_texture_*astc* Test: dEQP.KHR_GLES2/texture_3d_compressed_texture_negative_compressed_tex_image Change-Id: I8559ae42d19e63fdf96ea7a49f2d7e3d5098771c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1723094Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Enable ASTC 3D Textures
de50d039 · Tim Van Patten · Commit Bot · 4c118cb3 · de50d039 · de50d039
Commit de50d039 authored Jul 29, 2019 by Tim Van Patten Committed by Commit Bot Aug 02, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 14 deletions

validationES3.cpp src/libANGLE/validationES3.cpp +3 -9

deqp_khr_gles2_test_expectations.txt src/tests/deqp_support/deqp_khr_gles2_test_expectations.txt +0 -5

No files found.
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -534,9 +534,10 @@ bool ValidateES3TexImageParametersBase(Context *context,
            return false;
        }

-        if (texType == TextureType::_3D)
+        if ((texType == TextureType::_3D) && IsETC2EACFormat(internalformat))
        {
-            context->validationError(GL_INVALID_OPERATION, kInvalidTextureTarget);
+            // ES 3.1, Section 8.7, page 169.
+            context->validationError(GL_INVALID_OPERATION, kInternalFormatRequiresTexture2DArray);
            return false;
        }

@@ -685,13 +686,6 @@ bool ValidateES3TexImage3DParameters(Context *context,
        return false;
    }

-    if (IsETC2EACFormat(format) && target != TextureTarget::_2DArray)
-    {
-        // ES 3.1, Section 8.7, page 169.
-        context->validationError(GL_INVALID_OPERATION, kInternalFormatRequiresTexture2DArray);
-        return false;
-    }
-
    return ValidateES3TexImageParametersBase(context, target, level, internalformat, isCompressed,
                                             isSubImage, xoffset, yoffset, zoffset, width, height,
                                             depth, border, format, type, bufSize, pixels);

--- a/src/tests/deqp_support/deqp_khr_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles2_test_expectations.txt
@@ -43,8 +43,3 @@

 // Unclear what is happening here, failing to validate a 2D texture format
 3190 VULKAN : KHR-GLES2.texture_3d.copy_sub_image.rgba8 = SKIP
-
-// Compressed texture tests on Android
-3190 VULKAN PIXEL2 : KHR-GLES2.texture_3d.compressed_texture.rgba_astc_* = FAIL
-3190 VULKAN PIXEL2 : KHR-GLES2.texture_3d.compressed_texture.sgb8_alpha8_astc_* = FAIL
-3190 VULKAN PIXEL2 : KHR-GLES2.texture_3d.compressed_texture.srgb8_alpha8_astc_* = FAIL