Disable more tests for Apple DTK (macOS ARM)

Some of these new failures are on ES3-on-Metal and probably cropped up because they weren't running before. Bug: chromium:1132295 Change-Id: I631c53f1e6cf1374b0f3af62c9713456c924c6a1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2545122Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Kai Ninomiya <kainino@chromium.org>

Disable more tests for Apple DTK (macOS ARM)
12804827 · Kai Ninomiya · Commit Bot · ed87c16a · 12804827 · 12804827
Commit 12804827 authored Nov 17, 2020 by Kai Ninomiya Committed by Commit Bot Nov 17, 2020
Showing with 8 additions and 2 deletions

BPTCCompressedTextureTest.cpp src/tests/gl_tests/BPTCCompressedTextureTest.cpp +4 -0

MipmapTest.cpp src/tests/gl_tests/MipmapTest.cpp +2 -0

TextureTest.cpp src/tests/gl_tests/TextureTest.cpp +2 -2

No files found.
--- a/src/tests/gl_tests/BPTCCompressedTextureTest.cpp
+++ b/src/tests/gl_tests/BPTCCompressedTextureTest.cpp
@@ -273,6 +273,8 @@ TEST_P(BPTCCompressedTextureTestES3, CopyTexSubImage3DDisallowed)
 // Test uploading texture data from a PBO to a texture.
 TEST_P(BPTCCompressedTextureTestES3, PBOCompressedTexImage)
 {
+    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsMetal());
+
    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));

    GLTexture texture;
@@ -324,6 +326,8 @@ TEST_P(BPTCCompressedTextureTestES3, PBOCompressedTexImage)
 // Test uploading texture data from a PBO to a non-zero base texture.
 TEST_P(BPTCCompressedTextureTestES3, PBOCompressedTexImageNonZeroBase)
 {
+    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsMetal());
+
    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_bptc"));

    GLTexture texture;

--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -609,6 +609,8 @@ TEST_P(MipmapTest, DISABLED_ThreeLevelsInitData)
 // conformance2/textures/misc/tex-mipmap-levels WebGL2 test.
 TEST_P(MipmapTestES3, GenerateMipmapPartialLevels)
 {
+    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
+
    const std::vector<GLColor> kRedData(64, GLColor::red);
    const std::vector<GLColor> kGreenData(16, GLColor::green);
    const std::vector<GLColor> kBlueData(4, GLColor::blue);

--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -6870,7 +6870,7 @@ TEST_P(Texture2DFloatTestES2, TextureHalfFloatSampleLegacyTest)
 TEST_P(Texture2DFloatTestES3, TextureFloatLinearTest)
 {
    // TODO(crbug.com/1132295): Failing on Apple DTK.
-    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
+    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && (IsDesktopOpenGL() || IsMetal()));

    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float_linear"));

@@ -6909,7 +6909,7 @@ TEST_P(Texture2DFloatTestES2, TextureHalfFloatLinearTest)
 TEST_P(Texture2DFloatTestES3, TextureFloatLinearLegacyTest)
 {
    // TODO(crbug.com/1132295): Failing on Apple DTK.
-    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
+    ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && (IsDesktopOpenGL() || IsMetal()));

    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float"));
    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_OES_texture_float_linear"));