Add option to control maximum GrBatch lookback
Review URL: https://codereview.chromium.org/1498653002
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 1c30d54..2b20e17 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -89,6 +89,7 @@
GrDrawTarget::Options dtOptions;
dtOptions.fClipBatchToBounds = options.fClipBatchToBounds;
dtOptions.fDrawBatchBounds = options.fDrawBatchBounds;
+ dtOptions.fMaxBatchLookback = options.fMaxBatchLookback;
fDrawingManager.reset(new GrDrawingManager(this, dtOptions));
// GrBatchFontCache will eventually replace GrFontCache
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 59488c4..55f6624 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -32,6 +32,9 @@
////////////////////////////////////////////////////////////////////////////////
+// Experimentally we have found that most batching occurs within the first 10 comparisons.
+static const int kDefaultMaxBatchLookback = 10;
+
GrDrawTarget::GrDrawTarget(GrRenderTarget* rt, GrGpu* gpu, GrResourceProvider* resourceProvider,
const Options& options)
: fGpu(SkRef(gpu))
@@ -44,6 +47,8 @@
fClipMaskManager.reset(new GrClipMaskManager(this, options.fClipBatchToBounds));
fDrawBatchBounds = options.fDrawBatchBounds;
+ fMaxBatchLookback = (options.fMaxBatchLookback < 0) ? kDefaultMaxBatchLookback :
+ options.fMaxBatchLookback;
rt->setLastDrawTarget(this);
@@ -469,8 +474,6 @@
// 1) check every draw
// 2) intersect with something
// 3) find a 'blocker'
- // Experimentally we have found that most batching occurs within the first 10 comparisons.
- static const int kMaxLookback = 10;
GrBATCH_INFO("Re-Recording (%s, B%u)\n"
"\tBounds LRTB (%f, %f, %f, %f)\n",
@@ -480,7 +483,7 @@
batch->bounds().fTop, batch->bounds().fBottom);
GrBATCH_INFO(SkTabString(batch->dumpInfo(), 1).c_str());
GrBATCH_INFO("\tOutcome:\n");
- int maxCandidates = SkTMin(kMaxLookback, fBatches.count());
+ int maxCandidates = SkTMin(fMaxBatchLookback, fBatches.count());
if (maxCandidates) {
int i = 0;
while (true) {
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index c80ac34..42a6e79 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -44,9 +44,10 @@
public:
/** Options for GrDrawTarget behavior. */
struct Options {
- Options () : fClipBatchToBounds(false), fDrawBatchBounds(false) {}
+ Options () : fClipBatchToBounds(false), fDrawBatchBounds(false), fMaxBatchLookback(-1) {}
bool fClipBatchToBounds;
bool fDrawBatchBounds;
+ int fMaxBatchLookback;
};
GrDrawTarget(GrRenderTarget*, GrGpu*, GrResourceProvider*, const Options&);
@@ -297,6 +298,7 @@
GrRenderTarget* fRenderTarget;
bool fDrawBatchBounds;
+ int fMaxBatchLookback;
typedef SkRefCnt INHERITED;
};