Roll Skia from fa2ef26e999f to fe71605185d9 (2 revisions) am: 5ae056139d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/15029019
Change-Id: Ib6b4f0556ef51bb9b20b106a95383272f19baf72
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 8af9be4..d3ecc16 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -714,7 +714,7 @@
"Mac11": "Mac-11.1",
"Ubuntu18": "Ubuntu-18.04",
"Win": DEFAULT_OS_WIN,
- "Win10": "Windows-10-18363",
+ "Win10": "Windows-10-19041",
"Win2019": DEFAULT_OS_WIN,
"Win7": "Windows-7-SP1",
"Win8": "Windows-8.1-SP0",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index ac59487..59fc128 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -23990,7 +23990,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -24073,7 +24073,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -24151,7 +24151,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -24234,7 +24234,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -24312,7 +24312,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -24956,7 +24956,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25039,7 +25039,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25122,7 +25122,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25205,7 +25205,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25288,7 +25288,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25371,7 +25371,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25454,7 +25454,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25537,7 +25537,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25620,7 +25620,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25703,7 +25703,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25786,7 +25786,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25869,7 +25869,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -25952,7 +25952,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26035,7 +26035,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26118,7 +26118,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26201,7 +26201,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26284,7 +26284,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26367,7 +26367,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -26450,7 +26450,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43068,7 +43068,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43151,7 +43151,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43234,7 +43234,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43317,7 +43317,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43400,7 +43400,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -43483,7 +43483,7 @@
],
"dimensions": [
"gpu:1002:6646-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -44821,7 +44821,7 @@
],
"dimensions": [
"cpu:x86-64-i7-5557U",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -44904,7 +44904,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -44987,7 +44987,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45070,7 +45070,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45153,7 +45153,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45236,7 +45236,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45319,7 +45319,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45402,7 +45402,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45485,7 +45485,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45568,7 +45568,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45651,7 +45651,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45734,7 +45734,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45817,7 +45817,7 @@
],
"dimensions": [
"gpu:8086:1926-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45900,7 +45900,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -45983,7 +45983,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46066,7 +46066,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46149,7 +46149,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46232,7 +46232,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46315,7 +46315,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46398,7 +46398,7 @@
],
"dimensions": [
"gpu:8086:3ea5-26.20.100.7463",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46481,7 +46481,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46564,7 +46564,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46647,7 +46647,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46730,7 +46730,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4963",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46813,7 +46813,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46896,7 +46896,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -46979,7 +46979,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47062,7 +47062,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47145,7 +47145,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47228,7 +47228,7 @@
],
"dimensions": [
"gpu:10de:11c0-26.21.14.4120",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47311,7 +47311,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47394,7 +47394,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47477,7 +47477,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47560,7 +47560,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47643,7 +47643,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47726,7 +47726,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47809,7 +47809,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47892,7 +47892,7 @@
],
"dimensions": [
"gpu:1002:683d-26.20.13031.18002",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -47975,7 +47975,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -48058,7 +48058,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -48141,7 +48141,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -48224,7 +48224,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -48307,7 +48307,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
@@ -48390,7 +48390,7 @@
],
"dimensions": [
"gpu:10de:1401-27.21.14.5671",
- "os:Windows-10-18363",
+ "os:Windows-10-19041",
"pool:Skia"
],
"env_prefixes": {
diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 624e31a..d840e38 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -35,7 +35,7 @@
fChain.push_back(sk_make_sp<GrAAConvexPathRenderer>());
}
if (options.fGpuPathRenderers & GpuPathRenderers::kCoverageCounting) {
- fCoverageCountingPathRenderer = GrCoverageCountingPathRenderer::CreateIfSupported(caps);
+ fCoverageCountingPathRenderer = GrCoverageCountingPathRenderer::CreateIfSupported(context);
if (fCoverageCountingPathRenderer) {
// Don't add to the chain. This is only for clips.
// TODO: Remove from here.
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
index e89eea7..b4326dd 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
@@ -14,7 +14,12 @@
#include "src/gpu/GrSurfaceDrawContext.h"
#include "src/gpu/ccpr/GrCCClipProcessor.h"
-bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps) {
+bool GrCoverageCountingPathRenderer::IsSupported(const GrRecordingContext* ctx) {
+ if (ctx->backend() != GrBackendApi::kMock) {
+ // The atlas isn't ready for primetime. Disable it everywhere except for testing.
+ return false;
+ }
+ const GrCaps& caps = *ctx->priv().caps();
const GrShaderCaps& shaderCaps = *caps.shaderCaps();
GrBackendFormat defaultA8Format = caps.getDefaultBackendFormat(GrColorType::kAlpha_8,
GrRenderable::kYes);
@@ -35,8 +40,8 @@
}
std::unique_ptr<GrCoverageCountingPathRenderer> GrCoverageCountingPathRenderer::CreateIfSupported(
- const GrCaps& caps) {
- if (IsSupported(caps)) {
+ const GrRecordingContext* ctx) {
+ if (IsSupported(ctx)) {
return std::make_unique<GrCoverageCountingPathRenderer>();
}
return nullptr;
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
index 19ca80f..b39f3d9 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
@@ -24,9 +24,10 @@
*/
class GrCoverageCountingPathRenderer : public GrOnFlushCallbackObject {
public:
- static bool IsSupported(const GrCaps&);
+ static bool IsSupported(const GrRecordingContext*);
- static std::unique_ptr<GrCoverageCountingPathRenderer> CreateIfSupported(const GrCaps&);
+ static std::unique_ptr<GrCoverageCountingPathRenderer> CreateIfSupported(
+ const GrRecordingContext*);
using PendingPathsMap = std::map<uint32_t, sk_sp<GrCCPerOpsTaskPaths>>;
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer_none.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer_none.cpp
index 5e080fc..f7d240f 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer_none.cpp
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer_none.cpp
@@ -8,12 +8,12 @@
#include <memory>
#include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
-bool GrCoverageCountingPathRenderer::IsSupported(const GrCaps& caps) {
+bool GrCoverageCountingPathRenderer::IsSupported(const GrRecordingContext*) {
return false;
}
std::unique_ptr<GrCoverageCountingPathRenderer> GrCoverageCountingPathRenderer::CreateIfSupported(
- const GrCaps&) {
+ const GrRecordingContext*) {
return nullptr;
}
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 82a005e..e4eba39 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -1938,7 +1938,7 @@
}
}
if (1 == fWindow->sampleCount()) {
- if (GrCoverageCountingPathRenderer::IsSupported(*caps)) {
+ if (GrCoverageCountingPathRenderer::IsSupported(ctx)) {
prButton(GpuPathRenderers::kCoverageCounting);
}
prButton(GpuPathRenderers::kSmall);
@@ -2772,7 +2772,7 @@
}
}
if (1 == fWindow->sampleCount()) {
- if(GrCoverageCountingPathRenderer::IsSupported(*caps)) {
+ if(GrCoverageCountingPathRenderer::IsSupported(ctx)) {
writer.appendString(
gPathRendererNames[GpuPathRenderers::kCoverageCounting].c_str());
}
