Reland "Move GrGeometryProcessor's textures out of classes and into"
This reverts commit fdf05f4ff4e96e28a31e210cb471d149d736f528.
Reason for revert: Android fixed after removing multitexture support from TextureOp.
Original change's description:
> Revert "Move GrGeometryProcessor's textures out of classes and into"
>
> This reverts commit af87483873f0b370b90ebe956301a13cc8662cbe.
>
> Revert "GrGeometryProcessor derives from GrNonAtomicRef not GrProgramElement."
>
> This reverts commit 607be37e3d4ddbe2163c200d6e13bcee981f6bf7.
>
> Revert "Store GrMeshDrawOps' meshes in GrOpFlushState's arena."
>
> This reverts commit b948572c7862214fe2e1fa6cdfcab4fc7b1666ac.
>
> Revert "Remove multitexturing support from GrTextureOp."
>
> This reverts commit 986f64c601f3ed99f84f0c392d1a42e298f6d618.
>
> Revert "Make result of GrOp::combineIfPossible be an enum."
>
> This reverts commit 641ac7daa81cbfca06b310803fb1a607d0fc2b32.
>
> Bug: b/112244393
> Change-Id: I579491a3f2f2f2093f1e2a6141fa1e4cc7b760a4
> Reviewed-on: https://skia-review.googlesource.com/145646
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com
Change-Id: I1d41c2ecf7862e31fb025a7a00bb07bae9d83a47
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/112244393
Reviewed-on: https://skia-review.googlesource.com/145780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/bench/ImageCycleBench.cpp b/bench/ImageCycleBench.cpp
new file mode 100644
index 0000000..e7e0025
--- /dev/null
+++ b/bench/ImageCycleBench.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "Benchmark.h"
+
+#include "SkCanvas.h"
+#include "SkImage.h"
+#include "SkRandom.h"
+#include "SkSurface.h"
+
+/**
+ * Draws a small set of small images multiple times each with no overlaps so that each image could
+ * be batched. This was originally added to detect regressions as GrTextureOp is refactored to
+ * use "dynamic state" for texture bindings. Everything is kept small as we're mostly interested in
+ * CPU overhead.
+ */
+class ImageCycle : public Benchmark {
+public:
+ /**
+ * imageCnt is the number of images and repeat cnt is how many times each image is drawn per
+ * logical "frame."
+ */
+ ImageCycle(int imageCnt, int repeatCnt) : fImageCnt(imageCnt), fRepeatCnt(repeatCnt) {
+ fName.appendf("image_cycle_image_cnt_%d_repeat_cnt_%d", fImageCnt, fRepeatCnt);
+ }
+
+ bool isSuitableFor(Backend backend) override { return kGPU_Backend == backend; }
+
+protected:
+ const char* onGetName() override { return fName.c_str(); }
+
+ void onPerCanvasPreDraw(SkCanvas* canvas) override {
+ auto ii = SkImageInfo::Make(kImageSize.fWidth, kImageSize.fHeight, kRGBA_8888_SkColorType,
+ kPremul_SkAlphaType, nullptr);
+ SkRandom random;
+ fImages.reset(new sk_sp<SkImage>[fImageCnt]);
+ for (int i = 0; i < fImageCnt; ++i) {
+ auto surf = canvas->makeSurface(ii);
+ SkColor color = random.nextU();
+ surf->getCanvas()->clear(color);
+ SkPaint paint;
+ paint.setColor(~color);
+ paint.setBlendMode(SkBlendMode::kSrc);
+ surf->getCanvas()->drawRect(
+ SkRect::MakeLTRB(1, 1, kImageSize.fWidth - 1, kImageSize.fHeight - 1), paint);
+ fImages[i] = surf->makeImageSnapshot();
+ }
+ }
+
+ void onPerCanvasPostDraw(SkCanvas*) override { fImages.reset(); }
+
+ void onDraw(int loops, SkCanvas* canvas) override {
+ SkPaint paint;
+ paint.setFilterQuality(kNone_SkFilterQuality);
+ paint.setAntiAlias(true);
+ static constexpr SkScalar kPad = 2;
+ // To avoid tripping up bounds tracking we position the draws such that all the
+ // draws of image 0 are above those of image 1, etc.
+ static const int imagesPerRow =
+ SkScalarFloorToInt(kDeviceSize.fWidth / (kImageSize.fWidth + kPad));
+ int rowsPerImage = SkScalarCeilToInt((SkScalar)fRepeatCnt / imagesPerRow);
+ for (int l = 0; l < loops; ++l) {
+ for (int r = 0; r < fRepeatCnt; ++r) {
+ for (int i = 0; i < fImageCnt; ++i) {
+ SkScalar imageYOffset = i * rowsPerImage * (kImageSize.fHeight + kPad);
+ SkScalar rowYOffset = (r / imagesPerRow) * (kImageSize.fHeight + kPad);
+ SkScalar x = (r % imagesPerRow) * (kImageSize.fWidth + kPad);
+ canvas->drawImage(fImages[i].get(), x, imageYOffset + rowYOffset, &paint);
+ }
+ }
+ // Prevent any batching between "frames".
+ canvas->flush();
+ }
+ }
+
+private:
+ SkIPoint onGetSize() override { return {kDeviceSize.fWidth, kDeviceSize.fHeight}; }
+
+ static constexpr SkISize kImageSize{4, 4};
+ static constexpr SkISize kDeviceSize{64, 64};
+
+ std::unique_ptr<sk_sp<SkImage>[]> fImages;
+ SkString fName;
+ int fImageCnt;
+ int fRepeatCnt;
+
+ typedef Benchmark INHERITED;
+};
+
+DEF_BENCH(return new ImageCycle(5, 10));