diff options
| -rw-r--r-- | dm/DMSrcSink.cpp | 2 | ||||
| -rw-r--r-- | include/gpu/GrContextOptions.h | 5 | ||||
| -rw-r--r-- | src/gpu/GrContext.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 11 | ||||
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.h | 3 |
5 files changed, 0 insertions, 22 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index b495520287..eae0d2463d 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1216,7 +1216,6 @@ GPUSink::GPUSink(GrContextFactory::ContextType ct, DEFINE_bool(imm, false, "Run gpu configs in immediate mode."); DEFINE_bool(batchClip, false, "Clip each GrBatch to its device bounds for testing."); -DEFINE_bool(batchBounds, false, "Draw a wireframe bounds of each GrBatch."); DEFINE_int32(batchLookback, -1, "Maximum GrBatch lookback for combining, negative means default."); DEFINE_int32(batchLookahead, -1, "Maximum GrBatch lookahead for combining, negative means " "default."); @@ -1225,7 +1224,6 @@ Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString* log) co GrContextOptions grOptions; grOptions.fImmediateMode = FLAGS_imm; grOptions.fClipBatchToBounds = FLAGS_batchClip; - grOptions.fDrawBatchBounds = FLAGS_batchBounds; grOptions.fMaxBatchLookback = FLAGS_batchLookback; grOptions.fMaxBatchLookahead = FLAGS_batchLookahead; diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h index 0522b9d20b..e69b18ce62 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -43,11 +43,6 @@ struct GrContextOptions { verify that the clip bounds are conservative. */ bool fClipBatchToBounds = false; - /** For debugging purposes draw a wireframe device bounds rect for each GrBatch. The wire - frame rect is draw before the GrBatch in order to visualize batches that draw outside - of their dev bounds. */ - bool fDrawBatchBounds = false; - /** For debugging, override the default maximum look-back or look-ahead window for GrBatch combining. */ int fMaxBatchLookback = -1; 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; |