Skip to content

A
angle
Commit bf90b603 by Yuly Novikov Committed by Commit Bot
Options

Skip SubDataPreservesContents on Mac NVIDIA GL

Also SubDataOffsetPreservesContents. BUG=angleproject:2185 Change-Id: I73401e4b511313f14ee9659f3d20c8086e3d04a3 Reviewed-on: https://chromium-review.googlesource.com/719890 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 2bdbf788
Showing with 7 additions and 6 deletions
src/tests/gl_tests/ReadPixelsTest.cpp
...@@ -227,6 +227,9 @@ TEST_P(ReadPixelsPBOTest, ExistingDataPreserved) ...@@ -227,6 +227,9 @@ TEST_P(ReadPixelsPBOTest, ExistingDataPreserved)
// Test that calling SubData preserves PBO data. // Test that calling SubData preserves PBO data.
TEST_P(ReadPixelsPBOTest, SubDataPreservesContents) TEST_P(ReadPixelsPBOTest, SubDataPreservesContents)
{ {
// anglebug.com/2185
ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
...@@ -253,12 +256,10 @@ TEST_P(ReadPixelsPBOTest, SubDataPreservesContents) ...@@ -253,12 +256,10 @@ TEST_P(ReadPixelsPBOTest, SubDataPreservesContents)
// Same as the prior test, but with an offset. // Same as the prior test, but with an offset.
TEST_P(ReadPixelsPBOTest, SubDataOffsetPreservesContents) TEST_P(ReadPixelsPBOTest, SubDataOffsetPreservesContents)
{ {
// TODO: re-enable once root cause of http://anglebug.com/1415 is fixed // anglebug.com/1415
if (IsAndroid() && IsAdreno() && IsOpenGLES()) ANGLE_SKIP_TEST_IF(IsAndroid() && IsAdreno() && IsOpenGLES());
{ // anglebug.com/2185
std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl; ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
return;
}
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
......
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