From 528751873a8378bca27c51a6b08f0e5f3f041cc7 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 11 Aug 2017 13:57:41 -0400 Subject: Remove CHECK_SHOULD_DRAW from SkGpuDevice Change-Id: Ieb3910e2085235c62374d3e30d1ce6b9089de567 Reviewed-on: https://skia-review.googlesource.com/33780 Reviewed-by: Robert Phillips Commit-Queue: Brian Salomon --- src/gpu/SkGpuDevice.cpp | 51 ------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'src') diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index b0ca549992..76352d0240 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -55,15 +55,6 @@ #define ASSERT_SINGLE_OWNER \ SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fContext->debugSingleOwner());) -#if 0 - extern bool (*gShouldDrawProc)(); - #define CHECK_SHOULD_DRAW() \ - do { \ - if (gShouldDrawProc && !gShouldDrawProc()) return; \ - } while (0) -#else -#define CHECK_SHOULD_DRAW() -#endif /////////////////////////////////////////////////////////////////////////////// @@ -275,7 +266,6 @@ void SkGpuDevice::replaceRenderTargetContext(bool shouldRetainContent) { void SkGpuDevice::drawPaint(const SkPaint& paint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawPaint", fContext.get()); GrPaint grPaint; @@ -298,8 +288,6 @@ void SkGpuDevice::drawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawPoints", fContext.get()); - CHECK_SHOULD_DRAW(); - SkScalar width = paint.getStrokeWidth(); if (width < 0) { return; @@ -371,9 +359,6 @@ void SkGpuDevice::drawPoints(SkCanvas::PointMode mode, void SkGpuDevice::drawRect(const SkRect& rect, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawRect", fContext.get()); - CHECK_SHOULD_DRAW(); - - // A couple reasons we might need to call drawPath. if (paint.getMaskFilter() || paint.getPathEffect()) { SkPath path; @@ -401,8 +386,6 @@ void SkGpuDevice::drawRect(const SkRect& rect, const SkPaint& paint) { void SkGpuDevice::drawRRect(const SkRRect& rrect, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawRRect", fContext.get()); - CHECK_SHOULD_DRAW(); - GrPaint grPaint; if (!SkPaintToGrPaint(this->context(), fRenderTargetContext.get(), paint, this->ctm(), &grPaint)) { @@ -465,8 +448,6 @@ void SkGpuDevice::drawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawDRRect", fContext.get()); - CHECK_SHOULD_DRAW(); - if (outer.isEmpty()) { return; } @@ -525,8 +506,6 @@ void SkGpuDevice::drawRegion(const SkRegion& region, const SkPaint& paint) { void SkGpuDevice::drawOval(const SkRect& oval, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawOval", fContext.get()); - CHECK_SHOULD_DRAW(); - // Presumably the path effect warps this to something other than an oval if (paint.getPathEffect()) { SkPath path; @@ -557,8 +536,6 @@ void SkGpuDevice::drawArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle, bool useCenter, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawArc", fContext.get()); - CHECK_SHOULD_DRAW(); - if (paint.getMaskFilter()) { this->INHERITED::drawArc(oval, startAngle, sweepAngle, useCenter, paint); return; @@ -581,8 +558,6 @@ void SkGpuDevice::drawStrokedLine(const SkPoint points[2], const SkPaint& origPaint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawStrokedLine", fContext.get()); - CHECK_SHOULD_DRAW(); - // Adding support for round capping would require a // GrRenderTargetContext::fillRRectWithLocalMatrix entry point SkASSERT(SkPaint::kRound_Cap != origPaint.getStrokeCap()); @@ -665,7 +640,6 @@ void SkGpuDevice::drawPath(const SkPath& origSrcPath, } } - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawPath", fContext.get()); GrBlurUtils::drawPathWithMaskFilter(fContext.get(), fRenderTargetContext.get(), this->clip(), @@ -822,7 +796,6 @@ void SkGpuDevice::drawBitmap(const SkBitmap& bitmap, const SkPaint& paint) { SkMatrix m = SkMatrix::MakeTrans(x, y); ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); SkMatrix viewMatrix; viewMatrix.setConcat(this->ctm(), m); @@ -1080,7 +1053,6 @@ void SkGpuDevice::drawBitmapTile(const SkBitmap& bitmap, void SkGpuDevice::drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint& paint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawSprite", fContext.get()); if (fContext->abandoned()) { @@ -1099,7 +1071,6 @@ void SkGpuDevice::drawSprite(const SkBitmap& bitmap, void SkGpuDevice::drawSpecial(SkSpecialImage* special1, int left, int top, const SkPaint& paint, SkImage* clipImage,const SkMatrix& clipMatrix) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawSpecial", fContext.get()); // TODO: clipImage support. @@ -1162,8 +1133,6 @@ void SkGpuDevice::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& origDst, const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); - // The src rect is inferred to be the bmp bounds if not provided. Otherwise, the src rect must // be clipped to the bmp bounds. To determine tiling parameters we need the filter mode which // in turn requires knowing the src-to-dst mapping. If the src was clipped to the bmp bounds @@ -1311,8 +1280,6 @@ void SkGpuDevice::drawDevice(SkBaseDevice* device, GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawDevice", fContext.get()); // drawDevice is defined to be in device coords. - CHECK_SHOULD_DRAW(); - SkGpuDevice* dev = static_cast(device); sk_sp srcImg(dev->snapSpecial()); if (!srcImg) { @@ -1330,7 +1297,6 @@ void SkGpuDevice::drawImage(const SkImage* image, SkScalar x, SkScalar y, uint32_t pinnedUniqueID; if (sk_sp proxy = as_IB(image)->refPinnedTextureProxy(&pinnedUniqueID)) { - CHECK_SHOULD_DRAW(); GrTextureAdjuster adjuster(this->context(), std::move(proxy), image->alphaType(), image->bounds(), pinnedUniqueID, as_IB(image)->onImageInfo().colorSpace()); @@ -1347,7 +1313,6 @@ void SkGpuDevice::drawImage(const SkImage* image, SkScalar x, SkScalar y, } this->drawBitmap(bm, x, y, paint); } else if (image->isLazyGenerated()) { - CHECK_SHOULD_DRAW(); GrImageTextureMaker maker(fContext.get(), image, SkImage::kAllow_CachingHint); this->drawTextureProducer(&maker, nullptr, nullptr, SkCanvas::kFast_SrcRectConstraint, viewMatrix, this->clip(), paint); @@ -1363,7 +1328,6 @@ void SkGpuDevice::drawImageRect(const SkImage* image, const SkRect* src, ASSERT_SINGLE_OWNER uint32_t pinnedUniqueID; if (sk_sp proxy = as_IB(image)->refPinnedTextureProxy(&pinnedUniqueID)) { - CHECK_SHOULD_DRAW(); GrTextureAdjuster adjuster(this->context(), std::move(proxy), image->alphaType(), image->bounds(), pinnedUniqueID, as_IB(image)->onImageInfo().colorSpace()); @@ -1383,7 +1347,6 @@ void SkGpuDevice::drawImageRect(const SkImage* image, const SkRect* src, } this->drawBitmapRect(bm, src, dst, paint, constraint); } else if (image->isLazyGenerated()) { - CHECK_SHOULD_DRAW(); GrImageTextureMaker maker(fContext.get(), image, SkImage::kAllow_CachingHint); this->drawTextureProducer(&maker, src, &dst, constraint, this->ctm(), this->clip(), paint); } else if (as_IB(image)->getROPixels(&bm, fRenderTargetContext->getColorSpace())) { @@ -1395,8 +1358,6 @@ void SkGpuDevice::drawProducerNine(GrTextureProducer* producer, const SkIRect& center, const SkRect& dst, const SkPaint& paint) { GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawProducerNine", fContext.get()); - CHECK_SHOULD_DRAW(); - bool useFallback = paint.getMaskFilter() || paint.isAntiAlias() || GrFSAAType::kUnifiedMSAA == fRenderTargetContext->fsaaType(); bool doBicubic; @@ -1441,7 +1402,6 @@ void SkGpuDevice::drawImageNine(const SkImage* image, ASSERT_SINGLE_OWNER uint32_t pinnedUniqueID; if (sk_sp proxy = as_IB(image)->refPinnedTextureProxy(&pinnedUniqueID)) { - CHECK_SHOULD_DRAW(); GrTextureAdjuster adjuster(this->context(), std::move(proxy), image->alphaType(), image->bounds(), pinnedUniqueID, as_IB(image)->onImageInfo().colorSpace()); @@ -1469,8 +1429,6 @@ void SkGpuDevice::drawProducerLattice(GrTextureProducer* producer, const SkPaint& paint) { GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawProducerLattice", fContext.get()); - CHECK_SHOULD_DRAW(); - static const GrSamplerParams::FilterMode kMode = GrSamplerParams::kNone_FilterMode; std::unique_ptr fp(producer->createFragmentProcessor( SkMatrix::I(), SkRect::MakeIWH(producer->width(), producer->height()), @@ -1499,7 +1457,6 @@ void SkGpuDevice::drawImageLattice(const SkImage* image, ASSERT_SINGLE_OWNER uint32_t pinnedUniqueID; if (sk_sp proxy = as_IB(image)->refPinnedTextureProxy(&pinnedUniqueID)) { - CHECK_SHOULD_DRAW(); GrTextureAdjuster adjuster(this->context(), std::move(proxy), image->alphaType(), image->bounds(), pinnedUniqueID, as_IB(image)->onImageInfo().colorSpace()); @@ -1552,7 +1509,6 @@ void SkGpuDevice::wireframeVertices(SkVertices::VertexMode vmode, int vertexCoun const uint16_t indices[], int indexCount, const SkPaint& paint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "wireframeVertices", fContext.get()); SkPaint copy(paint); @@ -1609,7 +1565,6 @@ void SkGpuDevice::wireframeVertices(SkVertices::VertexMode vmode, int vertexCoun void SkGpuDevice::drawVertices(const SkVertices* vertices, SkBlendMode mode, const SkPaint& paint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawVertices", fContext.get()); SkASSERT(vertices); @@ -1635,7 +1590,6 @@ void SkGpuDevice::drawVertices(const SkVertices* vertices, SkBlendMode mode, con void SkGpuDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawShadow", fContext.get()); GrColor color = SkColorToPremulGrColor(rec.fColor); @@ -1656,7 +1610,6 @@ void SkGpuDevice::drawAtlas(const SkImage* atlas, const SkRSXform xform[], return; } - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawText", fContext.get()); SkPaint p(paint); @@ -1686,7 +1639,6 @@ void SkGpuDevice::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint& paint) { ASSERT_SINGLE_OWNER - CHECK_SHOULD_DRAW(); GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawText", fContext.get()); SkDEBUGCODE(this->validate();) @@ -1699,7 +1651,6 @@ void SkGpuDevice::drawPosText(const void* text, size_t byteLength, const SkPoint& offset, const SkPaint& paint) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawPosText", fContext.get()); - CHECK_SHOULD_DRAW(); SkDEBUGCODE(this->validate();) fRenderTargetContext->drawPosText(this->clip(), paint, this->ctm(), (const char*)text, @@ -1711,8 +1662,6 @@ void SkGpuDevice::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint, SkDrawFilter* drawFilter) { ASSERT_SINGLE_OWNER GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawTextBlob", fContext.get()); - CHECK_SHOULD_DRAW(); - SkDEBUGCODE(this->validate();) fRenderTargetContext->drawTextBlob(this->clip(), paint, this->ctm(), blob, x, y, drawFilter, -- cgit v1.2.3