Skip to content

Commit

Permalink
Enable VulkanFenceHelperTest.SkiaCallbackAfterFences on Windows
Browse files Browse the repository at this point in the history
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 <penghuang@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756529}
  • Loading branch information
phuang authored and Commit Bot committed Apr 4, 2020
1 parent b0062cc commit a0003f9
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions gpu/vulkan/vulkan_fence_helper_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 =
Expand All @@ -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.
Expand Down

0 comments on commit a0003f9

Please sign in to comment.