From 2a19313f8464393480fdd0bfcdecd3e40a7b49e6 Mon Sep 17 00:00:00 2001 From: Kenneth Russell Date: Thu, 22 Dec 2016 00:33:42 +0000 Subject: [PATCH] Revert "Supress failures for the 16.12.1 Windows AMD D3D11 driver." This reverts commit e2d0e41fa30879fbd0bf3f2688936dc0293fd79d. Reason for revert: The driver on these machines has been rolled back to the previous version, so these tests are expected to pass again. Original change's description: > Supress failures for the 16.12.1 Windows AMD D3D11 driver. > > BUG=676333 > > Change-Id: I2c29b3dd4ee00bb68575371fe3b1320aad087575 > Reviewed-on: https://chromium-review.googlesource.com/422479 > Reviewed-by: Geoff Lang > TBR=geofflang@chromium.org BUG=676333 NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia2952ef55002201dc8c34a4f45c2483bffbf6f43 Reviewed-on: https://chromium-review.googlesource.com/423126 Reviewed-by: Kenneth Russell --- .../deqp_gles3_test_expectations.txt | 18 ------------------ src/tests/gl_tests/TimerQueriesTest.cpp | 6 ------ 2 files changed, 24 deletions(-) diff --git a/src/tests/deqp_support/deqp_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_test_expectations.txt index 6d728ec3e..ad14dcf1d 100644 --- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt +++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt @@ -208,24 +208,6 @@ 1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.nearest_nearest = FAIL 1633 WIN AMD : dEQP-GLES3.functional.texture.mipmap.3d.max_lod.linear_nearest = FAIL -// Win AMD with the latest driver (16.12.1) has a bunch of new failures related to 3D textures (crbug.com/676333) -676333 WIN AMD : dEQP_GLES3.functional.texture.filtering.3d.formats.rgb565_linear_mipmap_linear = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.filtering.3d.formats.rgb565_linear_mipmap_nearest = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.filtering.3d.formats.rgb565_nearest_mipmap_linear = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.filtering.3d.formats.rgb565_nearest_mipmap_nearest = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb16f_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb16i_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb16ui_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb32f_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb32i_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb32ui_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb565_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb8_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb8_snorm_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb8i_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.rgb8ui_3d = FAIL -676333 WIN AMD : dEQP_GLES3.functional.texture.specification.basic.texsubimage3d.srgb8_3d = FAIL - // Windows Intel-specific failures 1349 WIN INTEL : dEQP-GLES3.functional.shaders.texture_functions.texturelod.isamplercube_* = FAIL diff --git a/src/tests/gl_tests/TimerQueriesTest.cpp b/src/tests/gl_tests/TimerQueriesTest.cpp index f584ae44b..862ecd47e 100644 --- a/src/tests/gl_tests/TimerQueriesTest.cpp +++ b/src/tests/gl_tests/TimerQueriesTest.cpp @@ -105,12 +105,6 @@ TEST_P(TimerQueriesTest, ProcAddresses) // Tests the time elapsed query TEST_P(TimerQueriesTest, TimeElapsed) { - if (IsWindows() && IsAMD()) - { - std::cout << "Test skipped on Windows AMD." << std::endl; - return; - } - if (!extensionEnabled("GL_EXT_disjoint_timer_query")) { std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."