diff options
Diffstat (limited to 'chromium/gpu/vulkan/vulkan_image_unittest.cc')
| -rw-r--r-- | chromium/gpu/vulkan/vulkan_image_unittest.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/gpu/vulkan/vulkan_image_unittest.cc b/chromium/gpu/vulkan/vulkan_image_unittest.cc index 0338611e057..54c717fc747 100644 --- a/chromium/gpu/vulkan/vulkan_image_unittest.cc +++ b/chromium/gpu/vulkan/vulkan_image_unittest.cc @@ -4,8 +4,10 @@ #include "gpu/vulkan/vulkan_image.h" +#include "base/logging.h" #include "build/build_config.h" #include "gpu/config/gpu_info_collector.h" +#include "gpu/config/gpu_test_config.h" #include "gpu/ipc/service/gpu_memory_buffer_factory.h" #include "gpu/vulkan/tests/basic_vulkan_test.h" #include "gpu/vulkan/vulkan_device_queue.h" @@ -54,18 +56,9 @@ TEST_F(VulkanImageTest, Create) { TEST_F(VulkanImageTest, CreateWithExternalMemory) { { - GPUInfo gpu_info; - CHECK(CollectBasicGraphicsInfo(&gpu_info)); - - // TODO(crbug.com/1069516): Fails on Intel driver >= 26.20.100.7158; this is - // seen on Win10 FYI x64 Exp Release (Intel HD 630), with 26.20.100.7870. - if (gpu_info.gpu.driver_version == "26.20.100.7870") { - // Can't be sure primary GPU is being used, so check it's the only one - // (aside from the Microsoft software renderer). - CHECK(gpu_info.secondary_gpus.size() == 1); - // Skip test. + // TODO(crbug.com/1069516) : Fails on current driver version on this bot. + if (GPUTestBotConfig::CurrentConfigMatches("Win10")) return; - } } constexpr gfx::Size size(100, 100); |