diff options
35 files changed, 923 insertions, 6 deletions
diff --git a/gm/gamut.cpp b/gm/gamut.cpp new file mode 100644 index 0000000000..41ce283ae7 --- /dev/null +++ b/gm/gamut.cpp @@ -0,0 +1,209 @@ +/* + * Copyright 2016 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "gm.h" + +#include "SkSurface.h" +#include "SkGradientShader.h" +#include "SkPM4fPriv.h" + +static const int gRectSize = 50; +static const SkScalar gScalarSize = SkIntToScalar(gRectSize); +static const int gTestWidth = 700; +static const int gTestHeight = 300; + +struct CellRenderer { + virtual void draw(SkCanvas* canvas) = 0; + virtual const char* label() = 0; + virtual ~CellRenderer() {} +}; + +struct PaintColorCellRenderer : public CellRenderer { + PaintColorCellRenderer(SkColor color) : fColor(color) {} + void draw(SkCanvas* canvas) override { + canvas->drawColor(fColor); + } + const char* label() override { + return "Paint Color"; + } +protected: + SkColor fColor; +}; + +struct BitmapCellRenderer : public CellRenderer { + BitmapCellRenderer(SkColor color, SkFilterQuality quality, float scale = 1.0f) + : fQuality(quality) { + int scaledSize = SkFloatToIntRound(scale * gRectSize); + fBitmap.allocPixels(SkImageInfo::MakeS32(scaledSize, scaledSize, kPremul_SkAlphaType)); + fBitmap.eraseColor(color); + const char* qualityNames[] = { "None", "Low", "Medium", "High" }; + fLabel = SkStringPrintf("Bitmap (%s)", qualityNames[quality]); + } + void draw(SkCanvas* canvas) override { + SkPaint paint; + paint.setFilterQuality(fQuality); + canvas->drawBitmapRect(fBitmap, SkRect::MakeIWH(gRectSize, gRectSize), &paint); + } + const char* label() override { + return fLabel.c_str(); + } +protected: + SkFilterQuality fQuality; + SkBitmap fBitmap; + SkString fLabel; +}; + +struct GradientCellRenderer : public CellRenderer { + GradientCellRenderer(SkColor colorOne, SkColor colorTwo) { + fColors[0] = colorOne; + fColors[1] = colorTwo; + } + void draw(SkCanvas* canvas) override { + SkPoint points[2] = { + SkPoint::Make(0, 0), + SkPoint::Make(0, gScalarSize) + }; + SkPaint paint; + paint.setShader(SkGradientShader::MakeLinear(points, fColors, nullptr, 2, + SkShader::kClamp_TileMode)); + canvas->drawPaint(paint); + } + const char* label() override { + return "Linear Gradient"; + } +protected: + SkColor fColors[2]; +}; + +struct VerticesCellRenderer : public CellRenderer { + VerticesCellRenderer(SkColor colorOne, SkColor colorTwo) { + fColors[0] = fColors[1] = colorOne; + fColors[2] = fColors[3] = colorTwo; + } + void draw(SkCanvas* canvas) override { + SkPaint paint; + SkPoint vertices[4] = { + SkPoint::Make(0, 0), + SkPoint::Make(gScalarSize, 0), + SkPoint::Make(gScalarSize, gScalarSize), + SkPoint::Make(0, gScalarSize) + }; + canvas->drawVertices(SkCanvas::kTriangleFan_VertexMode, 4, vertices, nullptr, fColors, + nullptr, nullptr, 0, paint); + } + const char* label() override { + return "Vertices"; + } +protected: + SkColor fColors[4]; +}; + +static void draw_gamut_grid(SkCanvas* canvas, SkTArray<SkAutoTDelete<CellRenderer>>& renderers) { + // We want our colors in our wide gamut to be obviously visibly distorted from sRGB, so we use + // Wide Gamut RGB (with sRGB gamma, for HW acceleration) as the working space for this test: + const float gWideGamutRGB_toXYZD50[]{ + 0.7161046f, 0.2581874f, 0.0000000f, // * R + 0.1009296f, 0.7249378f, 0.0517813f, // * G + 0.1471858f, 0.0168748f, 0.7734287f, // * B + }; + + SkMatrix44 wideGamutRGB_toXYZD50(SkMatrix44::kUninitialized_Constructor); + wideGamutRGB_toXYZD50.set3x3RowMajorf(gWideGamutRGB_toXYZD50); + + // Use the original canvas' color type, but account for gamma requirements + SkImageInfo origInfo = canvas->imageInfo(); + auto srgbCS = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + auto wideCS = SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed, wideGamutRGB_toXYZD50); + switch (origInfo.colorType()) { + case kRGBA_8888_SkColorType: + case kBGRA_8888_SkColorType: + break; + case kRGBA_F16_SkColorType: + srgbCS = srgbCS->makeLinearGamma(); + wideCS = wideCS->makeLinearGamma(); + break; + default: + return; + } + + // Make our two working surfaces (one sRGB, one Adobe) + SkImageInfo srgbGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, origInfo.colorType(), + kPremul_SkAlphaType, srgbCS); + SkImageInfo wideGamutInfo = SkImageInfo::Make(gRectSize, gRectSize, origInfo.colorType(), + kPremul_SkAlphaType, wideCS); + // readPixels doesn't do color conversion (yet), so we can use it to see the raw (wide) data + SkImageInfo dstInfo = srgbGamutInfo.makeColorSpace(nullptr); + sk_sp<SkSurface> srgbGamutSurface = canvas->makeSurface(srgbGamutInfo); + sk_sp<SkSurface> wideGamutSurface = canvas->makeSurface(wideGamutInfo); + if (!srgbGamutSurface || !wideGamutSurface) { + return; + } + SkCanvas* srgbGamutCanvas = srgbGamutSurface->getCanvas(); + SkCanvas* wideGamutCanvas = wideGamutSurface->getCanvas(); + + SkPaint textPaint; + textPaint.setAntiAlias(true); + textPaint.setColor(SK_ColorWHITE); + sk_tool_utils::set_portable_typeface(&textPaint); + + SkScalar x = 0, y = 0; + SkScalar textHeight = textPaint.getFontSpacing(); + + for (const auto& renderer : renderers) { + srgbGamutCanvas->clear(SK_ColorBLACK); + renderer->draw(srgbGamutCanvas); + wideGamutCanvas->clear(SK_ColorBLACK); + renderer->draw(wideGamutCanvas); + + canvas->drawText(renderer->label(), strlen(renderer->label()), x, y + textHeight, + textPaint); + + SkBitmap srgbBitmap; + srgbBitmap.setInfo(dstInfo); + srgbGamutCanvas->readPixels(&srgbBitmap, 0, 0); + canvas->drawBitmap(srgbBitmap, x, y + textHeight + 5); + x += (gScalarSize + 1); + + SkBitmap wideBitmap; + wideBitmap.setInfo(dstInfo); + wideGamutCanvas->readPixels(&wideBitmap, 0, 0); + canvas->drawBitmap(wideBitmap, x, y + textHeight + 5); + x += (gScalarSize + 10); + + if (x + (2 * gScalarSize + 1) > gTestWidth) { + x = 0; + y += (textHeight + gScalarSize + 10); + } + } +} + +DEF_SIMPLE_GM_BG(gamut, canvas, gTestWidth, gTestHeight, SK_ColorBLACK) { + SkTArray<SkAutoTDelete<CellRenderer>> renderers; + + // sRGB primaries, rendered as paint color + renderers.push_back(new PaintColorCellRenderer(SK_ColorRED)); + renderers.push_back(new PaintColorCellRenderer(SK_ColorGREEN)); + + // sRGB primaries, rendered as bitmaps + renderers.push_back(new BitmapCellRenderer(SK_ColorRED, kNone_SkFilterQuality)); + renderers.push_back(new BitmapCellRenderer(SK_ColorGREEN, kLow_SkFilterQuality)); + // Larger bitmap to trigger mipmaps + renderers.push_back(new BitmapCellRenderer(SK_ColorRED, kMedium_SkFilterQuality, 2.0f)); + // Smaller bitmap to trigger bicubic + renderers.push_back(new BitmapCellRenderer(SK_ColorGREEN, kHigh_SkFilterQuality, 0.5f)); + + // Various gradients involving sRGB primaries and white/black + renderers.push_back(new GradientCellRenderer(SK_ColorRED, SK_ColorGREEN)); + renderers.push_back(new GradientCellRenderer(SK_ColorGREEN, SK_ColorBLACK)); + renderers.push_back(new GradientCellRenderer(SK_ColorGREEN, SK_ColorWHITE)); + + // Vertex colors + renderers.push_back(new VerticesCellRenderer(SK_ColorRED, SK_ColorRED)); + renderers.push_back(new VerticesCellRenderer(SK_ColorRED, SK_ColorGREEN)); + + draw_gamut_grid(canvas, renderers); +} diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json index 7f86fd0736..3c9001b9d9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json @@ -746,6 +746,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json index c102502264..408ba4bd31 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json @@ -655,6 +655,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json index 42c8bb530b..ae6df5c8c3 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json @@ -748,6 +748,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json index 4c2cd7d021..86145d2577 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json @@ -746,6 +746,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json index b82c9cea92..f68287561a 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json @@ -747,6 +747,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json index 32fdd8e2c6..95ed115519 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json @@ -745,6 +745,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json index 2bca67bcc7..b65db9b567 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json @@ -746,6 +746,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json index 5d62fec7a4..eab9636603 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json @@ -742,6 +742,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--match", "~ResourceCache", "--noRAW_threading" diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index af546f4321..d464e7fb63 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -447,6 +447,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 6ed573eaba..978d49d6f6 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -448,7 +448,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index f9ec189947..98ef2c2539 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -441,6 +441,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index 66b4c49fbc..1833def156 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -377,6 +377,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--outResultsFile", "[SLAVE_BUILD]/out/coverage_results/abc123.cov" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 1666bf13e2..c6af460ce5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -428,7 +428,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 8bf7217125..965f229ec0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -311,6 +311,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--match", "~Once", "~Shared" diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index cb47773651..38e014bd7c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -427,7 +427,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 26b4e0e933..b99a235224 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -429,7 +429,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Release", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 0087bf6e8d..818471b0d9 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -311,6 +311,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--match", "~ReadWriteAlpha" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 429b73be4a..ac3db2ed42 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -334,6 +334,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", @@ -711,6 +731,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", @@ -1089,6 +1129,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 977f5ab692..80f04e931f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -468,6 +468,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index 587688fb14..ea7220c4b2 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -492,6 +492,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--noRAW_threading" ], "env": { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 6dd728419f..74f2e4d534 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -485,6 +485,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index d46e1c3317..936de84603 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -779,6 +779,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json index 7bc1cde315..56f1498893 100644 --- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json +++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json @@ -741,6 +741,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index a5861a4dfd..68632f0c78 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -492,6 +492,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "--noRAW_threading" ], "env": { diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json index c6c39e76ee..9a6a95b070 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json @@ -843,6 +843,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json index 919c14f1c1..857133abac 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json @@ -843,6 +843,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json index 715f4bc6e7..257cbcf893 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json @@ -843,6 +843,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index be5a0cafaa..e3c54013e6 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -427,7 +427,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 0aba8580eb..68c0ad6384 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -747,6 +747,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index 0b59d2dcb8..f73b075cda 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -847,6 +847,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json index 65fed41b88..3b977efca4 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json @@ -847,6 +847,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json index fe4c3f9d07..721e16d063 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json @@ -847,6 +847,26 @@ "gm", "_", "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index a7c181165f..f6de9cd7ff 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json @@ -432,7 +432,27 @@ "serialize-8888", "gm", "_", - "image-cacherator-from-ctable" + "image-cacherator-from-ctable", + "sp-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "gamut", + "lite-8888", + "gm", + "_", + "gamut", + "2ndpic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index 003df66a91..5809988d2e 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/infra/bots/recipes/swarm_test.py @@ -262,6 +262,14 @@ def dm_flags(bot): blacklist.extend([ '2ndpic-8888', 'gm', '_', test]) blacklist.extend(['serialize-8888', 'gm', '_', test]) + # GM that requires raster-backed canvas + for test in ['gamut']: + blacklist.extend([ 'sp-8888', 'gm', '_', test]) + blacklist.extend([ 'pic-8888', 'gm', '_', test]) + blacklist.extend([ 'lite-8888', 'gm', '_', test]) + blacklist.extend([ '2ndpic-8888', 'gm', '_', test]) + blacklist.extend(['serialize-8888', 'gm', '_', test]) + # Extensions for RAW images r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"] |