diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
| commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
| tree | 985faf01c526763515731569fa01a99f4dbef36e /gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp | |
| parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
| parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
| download | UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip | |
Merge branch 'master' into js-modules
Diffstat (limited to 'gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp')
| -rwxr-xr-x | gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp b/gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp index 8f3725ec0..8c4d282ff 100755 --- a/gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp +++ b/gfx/angle/src/tests/gl_tests/TimerQueriesTest.cpp @@ -311,13 +311,6 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest) // Tests timer queries operating under multiple EGL contexts with mid-query switching TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest) { - if (IsAMD() && IsOpenGL() && IsWindows() && IsDebug()) - { - // TODO(jmadill): Figure out why this test is flaky on Win/AMD/OpenGL/Debug. - std::cout << "Test skipped on Windows AMD OpenGL Debug." << std::endl; - return; - } - if (!extensionEnabled("GL_EXT_disjoint_timer_query")) { std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available." |