Unsuppress TextureCubeTest.CubeMapFBO on Intel/Win/Vulkan

This disables forceCpuPathForCubeMapCopy as well Bug: angleproject:2822 Bug: angleproject:3055 Change-Id: Iecb37d0c2d109e319c67310dd64ad8d4bbc14fd8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2594707 Commit-Queue: Jie A Chen <jie.a.chen@intel.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Unsuppress TextureCubeTest.CubeMapFBO on Intel/Win/Vulkan
c0bbe6cf · jchen10 · Commit Bot · de703db5 · c0bbe6cf · c0bbe6cf
Commit c0bbe6cf authored Dec 16, 2020 by jchen10 Committed by Commit Bot Dec 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +1 -2

TextureTest.cpp src/tests/gl_tests/TextureTest.cpp +0 -6

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1811,8 +1811,7 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
    // http://anglebug.com/2838
    ANGLE_FEATURE_CONDITION(&mFeatures, extraCopyBufferRegion, IsWindows() && isIntel);
-    // http://anglebug.com/3055
+    ANGLE_FEATURE_CONDITION(&mFeatures, forceCPUPathForCubeMapCopy, false);
-    ANGLE_FEATURE_CONDITION(&mFeatures, forceCPUPathForCubeMapCopy, IsWindows() && isIntel);
    // Work around incorrect NVIDIA point size range clamping.
    // http://anglebug.com/2970#c10

--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -1989,9 +1989,6 @@ TEST_P(TextureCubeTest, CubeMapFBO)
    // http://anglebug.com/3145
    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());
-    // http://anglebug.com/2822
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
    GLFramebuffer fbo;
    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
@@ -2031,9 +2028,6 @@ TEST_P(TextureCubeTest, CubeMapFBO)
 // Tests clearing a cube map with a scissor enabled.
 TEST_P(TextureCubeTest, CubeMapFBOScissoredClear)
 {
-    // TODO(jie.a.chen): Diagnose and fix. http://anglebug.com/2822
-    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsWindows());
    // http://anglebug.com/3145
    ANGLE_SKIP_TEST_IF(IsFuchsia() && IsIntel() && IsVulkan());