diff options
| author |  brianosman <brianosman@google.com> | 2016-09-29 13:43:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-29 13:43:49 -0700 |
| commit | 95e8d0a4ae3c755fd9ffbd0c276fc657999fecee (patch) | |
| tree | b51069087b6199a542408c5f14d6e343d21609c5 /gm/drawatlascolor.cpp | |
| parent | eb0d91cfa278bceba3ec9a3fdcbc7c47a2ed3a3f (diff) | |
Remove caching from the draw-atlas GMs. Fixes bugs cycling backends.
When we would change backend or color type in SampleApp, we'd be rendering
from a no-longer-valid image, leading to missing output, etc...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2381893004
Review-Url: https://codereview.chromium.org/2381893004
Diffstat (limited to 'gm/drawatlascolor.cpp')
| -rw-r--r-- | gm/drawatlascolor.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp index b5dba99640..d7b973c3fd 100644 --- a/gm/drawatlascolor.cpp +++ b/gm/drawatlascolor.cpp @@ -72,9 +72,7 @@ protected: void onDraw(SkCanvas* canvas) override { const SkRect target = SkRect::MakeWH(SkIntToScalar(kAtlasSize), SkIntToScalar(kAtlasSize)); - if (nullptr == fAtlas) { - fAtlas = make_atlas(canvas, kAtlasSize); - } + auto atlas = make_atlas(canvas, kAtlasSize); const struct { SkXfermode::Mode fMode; @@ -151,11 +149,11 @@ protected: canvas->translate(SkIntToScalar(i*(target.height()+kPad)), SkIntToScalar(kTextPad+kPad)); // w/o a paint - canvas->drawAtlas(fAtlas.get(), xforms, rects, quadColors, numColors, + canvas->drawAtlas(atlas.get(), xforms, rects, quadColors, numColors, gModes[i].fMode, nullptr, nullptr); canvas->translate(0.0f, numColors*(target.height()+kPad)); // w a paint - canvas->drawAtlas(fAtlas.get(), xforms, rects, quadColors, numColors, + canvas->drawAtlas(atlas.get(), xforms, rects, quadColors, numColors, gModes[i].fMode, nullptr, &paint); canvas->restore(); } @@ -168,9 +166,6 @@ private: static constexpr int kPad = 2; static constexpr int kTextPad = 8; - - sk_sp<SkImage> fAtlas; - typedef GM INHERITED; }; DEF_GM( return new DrawAtlasColorsGM; ) |