Skip to content

A
angle
Commit c41f2e56 by Khushal Committed by Commit Bot
Options

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: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent e2fc92ca
Showing with 12 additions and 0 deletions
src/tests/gl_tests/UniformBufferTest.cpp
...@@ -1636,6 +1636,9 @@ TEST_P(UniformBufferTest, LargeArrayOfStructs) ...@@ -1636,6 +1636,9 @@ TEST_P(UniformBufferTest, LargeArrayOfStructs)
// member. // member.
TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray) TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray)
{ {
// TODO(crbug.com/1037644): Re-enable this test on this config.
ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
GLint64 maxUniformBlockSize; GLint64 maxUniformBlockSize;
glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize); glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
std::ostringstream stream; std::ostringstream stream;
...@@ -1748,6 +1751,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray) ...@@ -1748,6 +1751,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeStructArray)
// a mat4 member and a float member. // a mat4 member and a float member.
TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray) TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray)
{ {
// TODO(crbug.com/1037644): Re-enable this test on this config.
ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
GLint64 maxUniformBlockSize; GLint64 maxUniformBlockSize;
glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize); glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
std::ostringstream stream; std::ostringstream stream;
...@@ -1878,6 +1884,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray) ...@@ -1878,6 +1884,9 @@ TEST_P(UniformBufferTest, UniformBlockWithOneLargeMixStructArray)
// struct array member in the same program, and they share a uniform buffer. // struct array member in the same program, and they share a uniform buffer.
TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer) TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer)
{ {
// TODO(crbug.com/1037644): Re-enable this test on this config.
ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
GLint64 maxUniformBlockSize; GLint64 maxUniformBlockSize;
glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize); glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
std::ostringstream stream; std::ostringstream stream;
...@@ -2007,6 +2016,9 @@ TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer) ...@@ -2007,6 +2016,9 @@ TEST_P(UniformBufferTest, UniformBlocksInSameProgramShareUniformBuffer)
// struct array member in the different programs, and they share a uniform buffer. // struct array member in the different programs, and they share a uniform buffer.
TEST_P(UniformBufferTest, UniformBlocksInDiffProgramShareUniformBuffer) TEST_P(UniformBufferTest, UniformBlocksInDiffProgramShareUniformBuffer)
{ {
// TODO(crbug.com/1037644): Re-enable this test on this config.
ANGLE_SKIP_TEST_IF(IsWindows7() && IsNVIDIA() && IsD3D11());
GLint64 maxUniformBlockSize; GLint64 maxUniformBlockSize;
glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize); glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
std::ostringstream stream1; std::ostringstream stream1;
......
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