Skip MSRTT tests on Nvidia/Windows7

These bots don't have VK_EXT_depth_stencil_resolve. Bug: chromium:1134286 Change-Id: I4cc5a627996139bf03dc3cc334435d08876a0a8a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2443584Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Skip MSRTT tests on Nvidia/Windows7
a8872e6d · Shahbaz Youssefi · Commit Bot · 22d7db6e · a8872e6d · a8872e6d
Commit a8872e6d authored Oct 01, 2020 by Shahbaz Youssefi Committed by Commit Bot Oct 01, 2020
Showing with 11 additions and 3 deletions

MultisampledRenderToTextureTest.cpp src/tests/gl_tests/MultisampledRenderToTextureTest.cpp +8 -3

VulkanPerformanceCounterTest.cpp src/tests/gl_tests/VulkanPerformanceCounterTest.cpp +3 -0

No files found.
--- a/src/tests/gl_tests/MultisampledRenderToTextureTest.cpp
+++ b/src/tests/gl_tests/MultisampledRenderToTextureTest.cpp
@@ -1473,7 +1473,10 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferClearThenBlitDepthStencil
    //
    //  - SwifthShader
    //  - Android
-    ANGLE_SKIP_TEST_IF(IsVulkan() && (isSwiftshader() || IsAndroid() || IsAMD()));
+    //  - AMD
+    //  - Nvidia on Windows7
+    ANGLE_SKIP_TEST_IF(IsVulkan() &&
+                       (isSwiftshader() || IsAndroid() || IsAMD() || (IsWindows7() && IsNVIDIA())));

    constexpr GLsizei kSize = 64;

@@ -1585,7 +1588,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencil)

    // Skip on configurations that don't support VK_KHR_depth_stencil_resolve.  See comment
    // in RenderbufferClearThenBlitDepthStencil.
-    ANGLE_SKIP_TEST_IF(IsVulkan() && (isSwiftshader() || IsAndroid() || IsAMD()));
+    ANGLE_SKIP_TEST_IF(IsVulkan() &&
+                       (isSwiftshader() || IsAndroid() || IsAMD() || (IsWindows7() && IsNVIDIA())));

    // http://anglebug.com/5096
    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan());
@@ -1698,7 +1702,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencilO

    // Skip on configurations that don't support VK_KHR_depth_stencil_resolve.  See comment
    // in RenderbufferClearThenBlitDepthStencil.
-    ANGLE_SKIP_TEST_IF(IsVulkan() && (isSwiftshader() || IsAndroid() || IsAMD()));
+    ANGLE_SKIP_TEST_IF(IsVulkan() &&
+                       (isSwiftshader() || IsAndroid() || IsAMD() || (IsWindows7() && IsNVIDIA())));

    // http://anglebug.com/5096
    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan());

--- a/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
+++ b/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
@@ -1645,6 +1645,9 @@ TEST_P(VulkanPerformanceCounterTest, RenderToTextureDepthStencilRenderbufferShou
    // http://anglebug.com/5083
    ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan());

+    // http://crbug.com/1134286
+    ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsVulkan());
+
    ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_multisampled_render_to_texture"));

    const rx::vk::PerfCounters &counters = hackANGLE();