Commit 85d9471f authored by Jonathan Backer's avatar Jonathan Backer Committed by Commit Bot

Use Skia readback on all platforms

Change-Id: Iafd0ac9d9c1507d586dc40939833ad8f847c37f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2055006Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: Jonathan Backer <backer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746838}
parent 8b2cf556
...@@ -421,12 +421,11 @@ ReadbackTestConfig const kTestConfigs[] = { ...@@ -421,12 +421,11 @@ ReadbackTestConfig const kTestConfigs[] = {
#if !defined(GL_NOT_ON_PLATFORM) #if !defined(GL_NOT_ON_PLATFORM)
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE}, ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP}, ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP},
#if !defined(OS_WIN) && !defined(OS_LINUX)
// TODO(crbug.com/1046788): The skia readback path doesn't support // TODO(crbug.com/1046788): The skia readback path doesn't support
// RGBA_TEXTURE readback requests yet. Don't run these tests on platforms // RGBA_TEXTURE readback requests yet. Don't run these tests on platforms
// that have UseSkiaForGLReadback enabled by default. // that have UseSkiaForGLReadback enabled by default.
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE}, //
#endif // ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP}, ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP},
#endif // !defined(GL_NOT_ON_PLATFORM) #endif // !defined(GL_NOT_ON_PLATFORM)
#if defined(ENABLE_CC_VULKAN_TESTS) #if defined(ENABLE_CC_VULKAN_TESTS)
...@@ -445,12 +444,11 @@ ReadbackTestConfig const kMaybeVulkanTestConfigs[] = { ...@@ -445,12 +444,11 @@ ReadbackTestConfig const kMaybeVulkanTestConfigs[] = {
#if !defined(GL_NOT_ON_PLATFORM) #if !defined(GL_NOT_ON_PLATFORM)
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE}, ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP}, ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP},
#if !defined(OS_WIN) && !defined(OS_LINUX)
// TODO(crbug.com/1046788): The skia readback path doesn't support // TODO(crbug.com/1046788): The skia readback path doesn't support
// RGBA_TEXTURE readback requests yet. Don't run these tests on platforms // RGBA_TEXTURE readback requests yet. Don't run these tests on platforms
// that have UseSkiaForGLReadback enabled by default. // that have UseSkiaForGLReadback enabled by default.
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE}, //
#endif // ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP}, ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP},
#endif // !defined(GL_NOT_ON_PLATFORM) #endif // !defined(GL_NOT_ON_PLATFORM)
#if defined(ENABLE_CC_VULKAN_TESTS) && !defined(THREAD_SANITIZER) && \ #if defined(ENABLE_CC_VULKAN_TESTS) && !defined(THREAD_SANITIZER) && \
......
...@@ -15,14 +15,8 @@ ...@@ -15,14 +15,8 @@
namespace features { namespace features {
// Use Skia's readback API instead of GLRendererCopier.
#if defined(OS_WIN) || defined(OS_LINUX)
const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback", const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
#else
const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback",
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
// Use the SkiaRenderer. // Use the SkiaRenderer.
#if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)) #if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment