aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2016-11-30 15:08:13 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-30 20:57:04 +0000
commit5c1c8d15f5f077b3fbec647139b3df31b74a4d95 (patch)
tree732dc08f34563702d809ac38eace2835ddc854dd /src
parentbf49d61fce3dc3829626762e1ffa3c4a70b7db32 (diff)
Remove batch bounds drawing debug option
Change-Id: I6b8ffc81a1255974f8acd1dfc47cfd406fd4b0bf Reviewed-on: https://skia-review.googlesource.com/5335 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrContext.cpp1
-rw-r--r--src/gpu/GrRenderTargetOpList.cpp11
-rw-r--r--src/gpu/GrRenderTargetOpList.h3
3 files changed, 0 insertions, 15 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 7b789bd08d..34b9abff68 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -95,7 +95,6 @@ void GrContext::initCommon(const GrContextOptions& options) {
GrRenderTargetOpList::Options rtOpListOptions;
rtOpListOptions.fClipBatchToBounds = options.fClipBatchToBounds;
- rtOpListOptions.fDrawBatchBounds = options.fDrawBatchBounds;
rtOpListOptions.fMaxBatchLookback = options.fMaxBatchLookback;
rtOpListOptions.fMaxBatchLookahead = options.fMaxBatchLookahead;
GrPathRendererChain::Options prcOptions;
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index b69d915f06..40c543d361 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -58,7 +58,6 @@ GrRenderTargetOpList::GrRenderTargetOpList(GrRenderTargetProxy* rtp, GrGpu* gpu,
fContext = fGpu->getContext();
fClipBatchToBounds = options.fClipBatchToBounds;
- fDrawBatchBounds = options.fDrawBatchBounds;
fMaxBatchLookback = (options.fMaxBatchLookback < 0) ? kDefaultMaxBatchLookback :
options.fMaxBatchLookback;
fMaxBatchLookahead = (options.fMaxBatchLookahead < 0) ? kDefaultMaxBatchLookahead :
@@ -209,16 +208,6 @@ bool GrRenderTargetOpList::drawBatches(GrBatchFlushState* flushState) {
}
flushState->setCommandBuffer(commandBuffer.get());
}
- if (fDrawBatchBounds) {
- const SkRect& bounds = fRecordedBatches[i].fClippedBounds;
- SkIRect ibounds;
- bounds.roundOut(&ibounds);
- // In multi-draw buffer all the batches use the same render target and we won't need to
- // get the batchs bounds.
- if (GrRenderTarget* rt = fRecordedBatches[i].fBatch->renderTarget()) {
- fGpu->drawDebugWireRect(rt, ibounds, 0xFF000000 | random.nextU());
- }
- }
fRecordedBatches[i].fBatch->draw(flushState, fRecordedBatches[i].fClippedBounds);
}
if (commandBuffer) {
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index d96f83d21a..2f4a3475c3 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -43,11 +43,9 @@ public:
struct Options {
Options ()
: fClipBatchToBounds(false)
- , fDrawBatchBounds(false)
, fMaxBatchLookback(-1)
, fMaxBatchLookahead(-1) {}
bool fClipBatchToBounds;
- bool fDrawBatchBounds;
int fMaxBatchLookback;
int fMaxBatchLookahead;
};
@@ -164,7 +162,6 @@ private:
GrResourceProvider* fResourceProvider;
bool fClipBatchToBounds;
- bool fDrawBatchBounds;
int fMaxBatchLookback;
int fMaxBatchLookahead;