diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrDrawContext.cpp | 20 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 61 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.h | 8 | ||||
-rw-r--r-- | src/gpu/batches/GrNinePatch.cpp | 51 | ||||
-rw-r--r-- | src/gpu/batches/GrNinePatch.h | 4 |
5 files changed, 33 insertions, 111 deletions
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp index db14498962..202be23590 100644 --- a/src/gpu/GrDrawContext.cpp +++ b/src/gpu/GrDrawContext.cpp @@ -35,8 +35,6 @@ #include "../private/GrAuditTrail.h" -#include "SkLatticeIter.h" - #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingManager->getContext()) #define ASSERT_SINGLE_OWNER \ SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fSingleOwner);) @@ -1001,23 +999,23 @@ void GrDrawContext::drawOval(const GrClip& clip, this->internalDrawPath(clip, paint, viewMatrix, path, style); } -void GrDrawContext::drawImageLattice(const GrClip& clip, - const GrPaint& paint, - const SkMatrix& viewMatrix, - int imageWidth, - int imageHeight, - std::unique_ptr<SkLatticeIter> iter, - const SkRect& dst) { +void GrDrawContext::drawImageNine(const GrClip& clip, + const GrPaint& paint, + const SkMatrix& viewMatrix, + int imageWidth, + int imageHeight, + const SkIRect& center, + const SkRect& dst) { ASSERT_SINGLE_OWNER RETURN_IF_ABANDONED SkDEBUGCODE(this->validate();) - GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::drawImageLattice"); + GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::drawImageNine"); AutoCheckFlush acf(fDrawingManager); SkAutoTUnref<GrDrawBatch> batch(GrNinePatch::CreateNonAA(paint.getColor(), viewMatrix, imageWidth, imageHeight, - std::move(iter), dst)); + center, dst)); GrPipelineBuilder pipelineBuilder(paint, this->mustUseHWAA(paint)); this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch); diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 040833b731..376d5e1b57 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1409,10 +1409,8 @@ void SkGpuDevice::drawProducerNine(const SkDraw& draw, GrTextureProducer* produc return; } - std::unique_ptr<SkLatticeIter> iter( - new SkLatticeIter(producer->width(), producer->height(), center, dst)); - fDrawContext->drawImageLattice(fClip, grPaint, *draw.fMatrix, producer->width(), - producer->height(), std::move(iter), dst); + fDrawContext->drawImageNine(fClip, grPaint, *draw.fMatrix, producer->width(), + producer->height(), center, dst); } void SkGpuDevice::drawImageNine(const SkDraw& draw, const SkImage* image, @@ -1442,61 +1440,6 @@ void SkGpuDevice::drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, con this->drawProducerNine(draw, &maker, center, dst, paint); } -void SkGpuDevice::drawProducerLattice(const SkDraw& draw, GrTextureProducer* producer, - const SkCanvas::Lattice& lattice, const SkRect& dst, - const SkPaint& paint) { - GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawProducerLattice", fContext); - - CHECK_SHOULD_DRAW(draw); - - static const GrTextureParams::FilterMode kMode = GrTextureParams::kNone_FilterMode; - sk_sp<GrFragmentProcessor> fp( - producer->createFragmentProcessor(SkMatrix::I(), - SkRect::MakeIWH(producer->width(), producer->height()), - GrTextureProducer::kNo_FilterConstraint, true, - &kMode, fDrawContext->getColorSpace(), - fDrawContext->sourceGammaTreatment())); - GrPaint grPaint; - if (!SkPaintToGrPaintWithTexture(this->context(), fDrawContext.get(), paint, *draw.fMatrix, - std::move(fp), producer->isAlphaOnly(), &grPaint)) { - return; - } - - std::unique_ptr<SkLatticeIter> iter( - new SkLatticeIter(producer->width(), producer->height(), lattice, dst)); - fDrawContext->drawImageLattice(fClip, grPaint, *draw.fMatrix, producer->width(), - producer->height(), std::move(iter), dst); -} - -void SkGpuDevice::drawImageLattice(const SkDraw& draw, const SkImage* image, - const SkCanvas::Lattice& lattice, const SkRect& dst, - const SkPaint& paint) { - ASSERT_SINGLE_OWNER - uint32_t pinnedUniqueID; - if (sk_sp<GrTexture> tex = as_IB(image)->refPinnedTexture(&pinnedUniqueID)) { - CHECK_SHOULD_DRAW(draw); - GrTextureAdjuster adjuster(tex.get(), image->alphaType(), image->bounds(), pinnedUniqueID, - as_IB(image)->onImageInfo().colorSpace()); - this->drawProducerLattice(draw, &adjuster, lattice, dst, paint); - } else { - SkBitmap bm; - if (SkImageCacherator* cacher = as_IB(image)->peekCacherator()) { - GrImageTextureMaker maker(fContext, cacher, image, SkImage::kAllow_CachingHint); - this->drawProducerLattice(draw, &maker, lattice, dst, paint); - } else if (as_IB(image)->getROPixels(&bm)) { - this->drawBitmapLattice(draw, bm, lattice, dst, paint); - } - } -} - -void SkGpuDevice::drawBitmapLattice(const SkDraw& draw, const SkBitmap& bitmap, - const SkCanvas::Lattice& lattice, const SkRect& dst, - const SkPaint& paint) { - ASSERT_SINGLE_OWNER - GrBitmapTextureMaker maker(fContext, bitmap); - this->drawProducerLattice(draw, &maker, lattice, dst, paint); -} - /////////////////////////////////////////////////////////////////////////////// // must be in SkCanvas::VertexMode order diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index d5fe04febf..2185f162d7 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -122,11 +122,6 @@ public: void drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint& paint) override; - void drawImageLattice(const SkDraw&, const SkImage*, const SkCanvas::Lattice&, - const SkRect& dst, const SkPaint&) override; - void drawBitmapLattice(const SkDraw&, const SkBitmap&, const SkCanvas::Lattice&, - const SkRect& dst, const SkPaint&) override; - void drawSpecial(const SkDraw&, SkSpecialImage*, int left, int top, const SkPaint& paint) override; sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&) override; @@ -248,9 +243,6 @@ private: void drawProducerNine(const SkDraw&, GrTextureProducer*, const SkIRect& center, const SkRect& dst, const SkPaint&); - void drawProducerLattice(const SkDraw&, GrTextureProducer*, const SkCanvas::Lattice& lattice, - const SkRect& dst, const SkPaint&); - bool drawDashLine(const SkPoint pts[2], const SkPaint& paint); void drawStrokedLine(const SkPoint pts[2], const SkDraw&, const SkPaint&); diff --git a/src/gpu/batches/GrNinePatch.cpp b/src/gpu/batches/GrNinePatch.cpp index 729d27ecac..cde3d266ca 100644 --- a/src/gpu/batches/GrNinePatch.cpp +++ b/src/gpu/batches/GrNinePatch.cpp @@ -29,14 +29,15 @@ public: static const int kVertsPerRect = 4; static const int kIndicesPerRect = 6; + static const int kRectsPerInstance = 9; // We could skip empty rects GrNonAANinePatchBatch(GrColor color, const SkMatrix& viewMatrix, int imageWidth, - int imageHeight, std::unique_ptr<SkLatticeIter> iter, const SkRect &dst) + int imageHeight, const SkIRect& center, const SkRect &dst) : INHERITED(ClassID()) { Patch& patch = fPatches.push_back(); patch.fViewMatrix = viewMatrix; patch.fColor = color; - patch.fIter = std::move(iter); + patch.fCenter = center; patch.fDst = dst; fImageWidth = imageWidth; @@ -52,9 +53,12 @@ public: SkString str; for (int i = 0; i < fPatches.count(); ++i) { - str.appendf("%d: Color: 0x%08x Dst [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", + str.appendf("%d: Color: 0x%08x Center [L: %d, T: %d, R: %d, B: %d], " + "Dst [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n", i, fPatches[i].fColor, + fPatches[i].fCenter.fLeft, fPatches[i].fCenter.fTop, + fPatches[i].fCenter.fRight, fPatches[i].fCenter.fBottom, fPatches[i].fDst.fLeft, fPatches[i].fDst.fTop, fPatches[i].fDst.fRight, fPatches[i].fDst.fBottom); } @@ -80,40 +84,35 @@ private: size_t vertexStride = gp->getVertexStride(); int patchCnt = fPatches.count(); - int numRects = 0; - for (int i = 0; i < patchCnt; i++) { - numRects += fPatches[i].fIter->numRects(); - } SkAutoTUnref<const GrBuffer> indexBuffer( target->resourceProvider()->refQuadIndexBuffer()); InstancedHelper helper; void* vertices = helper.init(target, kTriangles_GrPrimitiveType, vertexStride, indexBuffer, kVertsPerRect, - kIndicesPerRect, patchCnt * numRects); + kIndicesPerRect, patchCnt * kRectsPerInstance); if (!vertices || !indexBuffer) { SkDebugf("Could not allocate vertices\n"); return; } - intptr_t verts = reinterpret_cast<intptr_t>(vertices); for (int i = 0; i < patchCnt; i++) { - const Patch& patch = fPatches[i]; + intptr_t verts = reinterpret_cast<intptr_t>(vertices) + + i * kRectsPerInstance * kVertsPerRect * vertexStride; - // Apply the view matrix here if it is scale-translate. Otherwise, we need to - // wait until we've created the dst rects. - bool isScaleTranslate = patch.fViewMatrix.isScaleTranslate(); - if (isScaleTranslate) { - patch.fIter->mapDstScaleTranslate(patch.fViewMatrix); - } + const Patch& patch = fPatches[i]; + SkLatticeIter iter(fImageWidth, fImageHeight, patch.fCenter, patch.fDst); SkRect srcR, dstR; - intptr_t patchVerts = verts; - while (patch.fIter->next(&srcR, &dstR)) { + while (iter.next(&srcR, &dstR)) { SkPoint* positions = reinterpret_cast<SkPoint*>(verts); + positions->setRectFan(dstR.fLeft, dstR.fTop, dstR.fRight, dstR.fBottom, vertexStride); + SkASSERT(!patch.fViewMatrix.hasPerspective()); + patch.fViewMatrix.mapPointsWithStride(positions, vertexStride, kVertsPerRect); + // Setup local coords static const int kLocalOffset = sizeof(SkPoint) + sizeof(GrColor); SkPoint* coords = reinterpret_cast<SkPoint*>(verts + kLocalOffset); @@ -127,13 +126,6 @@ private: } verts += kVertsPerRect * vertexStride; } - - // If we didn't handle it above, apply the matrix here. - if (!isScaleTranslate) { - SkPoint* positions = reinterpret_cast<SkPoint*>(patchVerts); - patch.fViewMatrix.mapPointsWithStride(positions, vertexStride, - kVertsPerRect * patch.fIter->numRects()); - } } helper.recordDraw(target, gp.get()); } @@ -159,14 +151,14 @@ private: fOverrides = that->fOverrides; } - fPatches.move_back_n(that->fPatches.count(), that->fPatches.begin()); + fPatches.push_back_n(that->fPatches.count(), that->fPatches.begin()); this->joinBounds(*that); return true; } struct Patch { SkMatrix fViewMatrix; - std::unique_ptr<SkLatticeIter> fIter; + SkIRect fCenter; SkRect fDst; GrColor fColor; }; @@ -181,8 +173,7 @@ private: namespace GrNinePatch { GrDrawBatch* CreateNonAA(GrColor color, const SkMatrix& viewMatrix, int imageWidth, int imageHeight, - std::unique_ptr<SkLatticeIter> iter, const SkRect& dst) { - return new GrNonAANinePatchBatch(color, viewMatrix, imageWidth, imageHeight, std::move(iter), - dst); + const SkIRect& center, const SkRect& dst) { + return new GrNonAANinePatchBatch(color, viewMatrix, imageWidth, imageHeight, center, dst); } }; diff --git a/src/gpu/batches/GrNinePatch.h b/src/gpu/batches/GrNinePatch.h index 02664c6449..0a4ffd6e03 100644 --- a/src/gpu/batches/GrNinePatch.h +++ b/src/gpu/batches/GrNinePatch.h @@ -9,18 +9,16 @@ #define GrNinePatch_DEFINED #include "GrColor.h" -#include "SkCanvas.h" class GrDrawBatch; class SkBitmap; -class SkLatticeIter; class SkMatrix; struct SkIRect; struct SkRect; namespace GrNinePatch { GrDrawBatch* CreateNonAA(GrColor color, const SkMatrix& viewMatrix, int imageWidth, int imageHeight, - std::unique_ptr<SkLatticeIter> iter, const SkRect& dst); + const SkIRect& center, const SkRect& dst); }; #endif |