diff --git a/cc/trees/layer_tree_host_pixeltest_mirror.cc b/cc/trees/layer_tree_host_pixeltest_mirror.cc index 1165594214702c..15ab1efea06377 100644 --- a/cc/trees/layer_tree_host_pixeltest_mirror.cc +++ b/cc/trees/layer_tree_host_pixeltest_mirror.cc @@ -25,12 +25,14 @@ class LayerTreeHostMirrorPixelTest }; const TestRendererType kRendererTypes[] = { - TestRendererType::kGL, - TestRendererType::kSkiaGL, + TestRendererType::kGL, TestRendererType::kSkiaGL, TestRendererType::kSoftware, #if defined(ENABLE_CC_VULKAN_TESTS) TestRendererType::kSkiaVk, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + TestRendererType::kSkiaDawn, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, diff --git a/cc/trees/layer_tree_host_pixeltest_readback.cc b/cc/trees/layer_tree_host_pixeltest_readback.cc index 52d772370c3007..cebb1e7274a695 100644 --- a/cc/trees/layer_tree_host_pixeltest_readback.cc +++ b/cc/trees/layer_tree_host_pixeltest_readback.cc @@ -430,6 +430,9 @@ ReadbackTestConfig const kTestConfigs[] = { #if defined(ENABLE_CC_VULKAN_TESTS) ReadbackTestConfig{TestRendererType::kSkiaVk, TestReadBackType::kBitmap}, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + ReadbackTestConfig{TestRendererType::kSkiaDawn, TestReadBackType::kBitmap}, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, @@ -453,6 +456,9 @@ ReadbackTestConfig const kMaybeVulkanTestConfigs[] = { !defined(MEMORY_SANITIZER) ReadbackTestConfig{TestRendererType::kSkiaVk, TestReadBackType::kBitmap}, #endif +#if defined(ENABLE_CC_DAWN_TESTS) + ReadbackTestConfig{TestRendererType::kSkiaDawn, TestReadBackType::kBitmap}, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, diff --git a/cc/trees/layer_tree_host_pixeltest_scrollbars.cc b/cc/trees/layer_tree_host_pixeltest_scrollbars.cc index c8b4b02d256057..f0d0388afcfe45 100644 --- a/cc/trees/layer_tree_host_pixeltest_scrollbars.cc +++ b/cc/trees/layer_tree_host_pixeltest_scrollbars.cc @@ -79,6 +79,9 @@ TestRendererType const kRendererTypes[] = { #if defined(ENABLE_CC_VULKAN_TESTS) TestRendererType::kSkiaVk, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + TestRendererType::kSkiaDawn, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, @@ -180,7 +183,8 @@ TEST_P(LayerTreeHostScrollbarsPixelTest, MAYBE_HugeTransformScale) { scale_transform.Scale(scale, scale); layer->SetTransform(scale_transform); - if (renderer_type_ == TestRendererType::kSkiaGL) + if (renderer_type_ == TestRendererType::kSkiaGL || + renderer_type_ == TestRendererType::kSkiaDawn) pixel_comparator_ = std::make_unique(true); RunPixelTest(background, diff --git a/cc/trees/layer_tree_host_pixeltest_synchronous.cc b/cc/trees/layer_tree_host_pixeltest_synchronous.cc index 484851d7368914..1f4fc7bfcdd1ee 100644 --- a/cc/trees/layer_tree_host_pixeltest_synchronous.cc +++ b/cc/trees/layer_tree_host_pixeltest_synchronous.cc @@ -56,6 +56,9 @@ TestRendererType const kRendererTypesGpu[] = { #if defined(ENABLE_CC_VULKAN_TESTS) TestRendererType::kSkiaVk, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + TestRendererType::kSkiaDawn, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc index c1faa4152e86b9..a2aa1aaf086e0e 100644 --- a/cc/trees/layer_tree_host_pixeltest_tiles.cc +++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc @@ -161,6 +161,9 @@ std::vector const kTestCases = { #if defined(ENABLE_CC_VULKAN_TESTS) {TestRendererType::kSkiaVk, TestRasterType::kOop}, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + {TestRendererType::kSkiaDawn, TestRasterType::kOop}, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; INSTANTIATE_TEST_SUITE_P(All, @@ -195,6 +198,9 @@ std::vector const kTestCasesMultiThread = { // Vulkan in these tests. {TestRendererType::kSkiaVk, TestRasterType::kOop}, #endif // defined(ENABLE_CC_VULKAN_TESTS) +#if defined(ENABLE_CC_DAWN_TESTS) + {TestRendererType::kSkiaDawn, TestRasterType::kOop}, +#endif // defined(ENABLE_CC_DAWN_TESTS) }; using LayerTreeHostTilesTestPartialInvalidationMultiThread = diff --git a/testing/buildbot/chromium.ci.json b/testing/buildbot/chromium.ci.json index d7a114e06f3bae..7214152823d7bd 100644 --- a/testing/buildbot/chromium.ci.json +++ b/testing/buildbot/chromium.ci.json @@ -40838,7 +40838,8 @@ "gtest_tests": [ { "args": [ - "--no-xvfb" + "--no-xvfb", + "--test-launcher-filter-file=../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter" ], "merge": { "args": [], diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 052e3575cb3ad8..ded4fc0d2714df 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json @@ -12470,7 +12470,8 @@ "gtest_tests": [ { "args": [ - "--no-xvfb" + "--no-xvfb", + "--test-launcher-filter-file=../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter" ], "merge": { "args": [], diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn index c6ca12b1e3ed10..25700ae1d6947b 100644 --- a/testing/buildbot/filters/BUILD.gn +++ b/testing/buildbot/filters/BUILD.gn @@ -19,7 +19,10 @@ source_set("cc_unittests_filters") { testonly = true - data = [ "//testing/buildbot/filters/android.emulator.cc_unittests.filter" ] + data = [ + "//testing/buildbot/filters/android.emulator.cc_unittests.filter", + "//testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter", + ] } source_set("blink_web_tests_filter") { diff --git a/testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter b/testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter new file mode 100644 index 00000000000000..912e7b094f2d6a --- /dev/null +++ b/testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter @@ -0,0 +1,3 @@ +# crbug.com/1088479: Partial Raster isn't supported using Skia Dawn Vulkan +-All/LayerTreeHostTilesTestPartialInvalidation.PartialRaster/6 +-All/LayerTreeHostTilesTestPartialInvalidationMultiThread.PartialRaster/3 diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl index 62ed4a3e1720ff..8f2677681b9643 100644 --- a/testing/buildbot/test_suites.pyl +++ b/testing/buildbot/test_suites.pyl @@ -2570,7 +2570,10 @@ 'gpu_skia_renderer_dawn_gtests': { 'cc_unittests': { - 'linux_args': ['--no-xvfb'], + 'linux_args': [ + '--no-xvfb', + '--test-launcher-filter-file=../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter', + ], }, 'viz_unittests': { 'linux_args': [