Disable UniformBufferTests on Windows 7 / D3D11 / NVIDIA.

Bug: chromium:1037644 Change-Id: Ic8bf76bb0c1b8bdcf36f6af5a8d91ac815334917 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1981070 Commit-Queue: Kenneth Russell <kbr@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org>

Disable UniformBufferTests on Windows 7 / D3D11 / NVIDIA.
c41f2e56 · Khushal · Commit Bot · e2fc92ca · c41f2e56
Commit c41f2e56 authored Dec 23, 2019 by Khushal Committed by Commit Bot Dec 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

UniformBufferTest.cpp src/tests/gl_tests/UniformBufferTest.cpp +12 -0

No files found.
--- a/src/tests/gl_tests/UniformBufferTest.cpp
+++ b/src/tests/gl_tests/UniformBufferTest.cpp
@@ -1636,6 +1636,9 @@ TEST_P(UniformBufferTest, LargeArrayOfStructs)
 // member.
 TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray)
 {
+    // TODO(crbug.com/1037644): Re-enable this test on this config.
+    ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
+
    GLint64 maxUniformBlockSize;
    glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
    std::ostringstream stream;
@@ -1748,6 +1751,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray)
 // a mat4 member and a float member.
 TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray)
 {
+    // TODO(crbug.com/1037644): Re-enable this test on this config.
+    ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
+
    GLint64 maxUniformBlockSize;
    glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
    std::ostringstream stream;
@@ -1878,6 +1884,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray)
 // struct array member in the same program, and they share a uniform buffer.
 TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer)
 {
+    // TODO(crbug.com/1037644): Re-enable this test on this config.
+    ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
+
    GLint64 maxUniformBlockSize;
    glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
    std::ostringstream stream;
@@ -2007,6 +2016,9 @@ TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer)
 // struct array member in the different programs, and they share a uniform buffer.
 TEST_P(UniformBufferTest, UniformBlocksInDiffProgramShareUniformBuffer)
 {
+    // TODO(crbug.com/1037644): Re-enable this test on this config.
+    ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
+
    GLint64 maxUniformBlockSize;
    glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
    std::ostringstream stream1;