Skip to content

A
angle
Commit a8872e6d by Shahbaz Youssefi Committed by Commit Bot
Options

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: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 22d7db6e
Showing with 11 additions and 3 deletions
src/tests/gl_tests/MultisampledRenderToTextureTest.cpp
...@@ -1473,7 +1473,10 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferClearThenBlitDepthStencil ...@@ -1473,7 +1473,10 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferClearThenBlitDepthStencil
// //
// - SwifthShader // - SwifthShader
// - Android // - 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; constexpr GLsizei kSize = 64;
...@@ -1585,7 +1588,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencil) ...@@ -1585,7 +1588,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencil)
// Skip on configurations that don't support VK_KHR_depth_stencil_resolve. See comment // Skip on configurations that don't support VK_KHR_depth_stencil_resolve. See comment
// in RenderbufferClearThenBlitDepthStencil. // in RenderbufferClearThenBlitDepthStencil.
ANGLE_SKIP_TEST_IF(IsVulkan() && (isSwiftshader() || IsAndroid() || IsAMD())); ANGLE_SKIP_TEST_IF(IsVulkan() &&
(isSwiftshader() || IsAndroid() || IsAMD() || (IsWindows7() && IsNVIDIA())));
// http://anglebug.com/5096 // http://anglebug.com/5096
ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan());
...@@ -1698,7 +1702,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencilO ...@@ -1698,7 +1702,8 @@ TEST_P(MultisampledRenderToTextureES3Test, RenderbufferDrawThenBlitDepthStencilO
// Skip on configurations that don't support VK_KHR_depth_stencil_resolve. See comment // Skip on configurations that don't support VK_KHR_depth_stencil_resolve. See comment
// in RenderbufferClearThenBlitDepthStencil. // in RenderbufferClearThenBlitDepthStencil.
ANGLE_SKIP_TEST_IF(IsVulkan() && (isSwiftshader() || IsAndroid() || IsAMD())); ANGLE_SKIP_TEST_IF(IsVulkan() &&
(isSwiftshader() || IsAndroid() || IsAMD() || (IsWindows7() && IsNVIDIA())));
// http://anglebug.com/5096 // http://anglebug.com/5096
ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan());
......
src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
...@@ -1645,6 +1645,9 @@ TEST_P(VulkanPerformanceCounterTest, RenderToTextureDepthStencilRenderbufferShou ...@@ -1645,6 +1645,9 @@ TEST_P(VulkanPerformanceCounterTest, RenderToTextureDepthStencilRenderbufferShou
// http://anglebug.com/5083 // http://anglebug.com/5083
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsVulkan()); 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")); ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_multisampled_render_to_texture"));
const rx::vk::PerfCounters &counters = hackANGLE(); const rx::vk::PerfCounters &counters = hackANGLE();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment