From a0003f9421871fa0a649ce8847254b67947b2691 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Sat, 4 Apr 2020 20:20:44 +0000 Subject: [PATCH] Enable VulkanFenceHelperTest.SkiaCallbackAfterFences on Windows The GPU driver on bot win10 gtx1660 has been updated to the latest version. Let's enable the test to try it on that bot. TBR=cwallez@chromium.org Bug: 1066854 Change-Id: Ibc9d078f9a7bb96fe83f03ebada357b63b72bf04 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136453 Reviewed-by: Peng Huang Commit-Queue: Peng Huang Cr-Commit-Position: refs/heads/master@{#756529} --- gpu/vulkan/vulkan_fence_helper_unittest.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gpu/vulkan/vulkan_fence_helper_unittest.cc b/gpu/vulkan/vulkan_fence_helper_unittest.cc index f972415046fdb..a92156084f4af 100644 --- a/gpu/vulkan/vulkan_fence_helper_unittest.cc +++ b/gpu/vulkan/vulkan_fence_helper_unittest.cc @@ -5,7 +5,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/bind.h" -#include "build/build_config.h" #include "gpu/vulkan/tests/basic_vulkan_test.h" #include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_fence_helper.h" @@ -148,13 +147,7 @@ TEST_F(VulkanFenceHelperTest, SkiaCallbackBeforeFences) { EXPECT_EQ(10u, cleanups_run); } -// The test failed on Win with GTX1660 GPU. -// https://crbug.com/1066854 -#if defined(OS_WIN) -TEST_F(VulkanFenceHelperTest, DISABLED_SkiaCallbackAfterFences) { -#else TEST_F(VulkanFenceHelperTest, SkiaCallbackAfterFences) { -#endif VulkanFenceHelper* fence_helper = GetDeviceQueue()->GetFenceHelper(); uint32_t cleanups_run = 0; auto increment_cleanups_callback = @@ -175,8 +168,7 @@ TEST_F(VulkanFenceHelperTest, SkiaCallbackAfterFences) { fence_helper->GenerateCleanupFence(); EXPECT_TRUE(fence_handle.is_valid()); - // Call vkQueueWaitIdle() to make sure the |fence_handle| is passed, - // however it doesn't work on Win with GTX1660 GPU. + // Call vkQueueWaitIdle() to make sure the |fence_handle| is passed. vkQueueWaitIdle(queue()); // Enqueue 5 more callbacks.