diff options
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 199 |
1 files changed, 29 insertions, 170 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index f89d4b18a5..1c797c3b95 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -653,178 +653,37 @@ void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, /////////////////////////////////////////////////////////////////////////////// -static void setInsetFan(GrPoint pts[4], const GrRect& r, - GrScalar dx, GrScalar dy) { - pts->setRectFan(r.fLeft + dx, r.fTop + dy, r.fRight - dx, r.fBottom - dy); -} - -static GrColor getColorForMesh(const GrPaint& paint) { - if (NULL == paint.getTexture()) { - return paint.fColor; - } else { - unsigned a = GrColorUnpackA(paint.fColor); - return GrColorPackRGBA(a, a, a, a); - } -} - -static const uint16_t gFillAARectIdx1[] = { - 0, 1, 5, 5, 4, 0, - 1, 2, 6, 6, 5, 1, - 2, 3, 7, 7, 6, 2, - 3, 0, 4, 4, 7, 3, - 4, 5, 6, 6, 7, 4, -}; - -static void fillDevAARect(GrContext* ctx, const GrPaint& paint, - const GrRect& rect) { - if (rect.isEmpty()) { - return; - } - - GrAutoMatrix avm(ctx, GrMatrix::I()); - - GrPoint verts[8]; - GrPoint* texs = NULL; - GrColor colors[8]; - - setInsetFan(&verts[ 0], rect, -0.5f, -0.5f); - setInsetFan(&verts[ 4], rect, 0.5f, 0.5f); - - sk_memset32(&colors[ 0], 0, 4); - sk_memset32(&colors[ 4], getColorForMesh(paint), 4); - - ctx->drawVertices(paint, kTriangles_PrimitiveType, - 8, verts, texs, colors, - gFillAARectIdx1, SK_ARRAY_COUNT(gFillAARectIdx1)); -} - -static const uint16_t gStrokeAARectIdx[] = { - 0 + 0, 1 + 0, 5 + 0, 5 + 0, 4 + 0, 0 + 0, - 1 + 0, 2 + 0, 6 + 0, 6 + 0, 5 + 0, 1 + 0, - 2 + 0, 3 + 0, 7 + 0, 7 + 0, 6 + 0, 2 + 0, - 3 + 0, 0 + 0, 4 + 0, 4 + 0, 7 + 0, 3 + 0, - - 0 + 4, 1 + 4, 5 + 4, 5 + 4, 4 + 4, 0 + 4, - 1 + 4, 2 + 4, 6 + 4, 6 + 4, 5 + 4, 1 + 4, - 2 + 4, 3 + 4, 7 + 4, 7 + 4, 6 + 4, 2 + 4, - 3 + 4, 0 + 4, 4 + 4, 4 + 4, 7 + 4, 3 + 4, - - 0 + 8, 1 + 8, 5 + 8, 5 + 8, 4 + 8, 0 + 8, - 1 + 8, 2 + 8, 6 + 8, 6 + 8, 5 + 8, 1 + 8, - 2 + 8, 3 + 8, 7 + 8, 7 + 8, 6 + 8, 2 + 8, - 3 + 8, 0 + 8, 4 + 8, 4 + 8, 7 + 8, 3 + 8, -}; - -static void strokeDevAARect(GrContext* ctx, const GrPaint& paint, - const GrRect& rect, const SkPoint& strokeSize) { - const GrScalar dx = SkScalarToGrScalar(strokeSize.fX); - const GrScalar dy = SkScalarToGrScalar(strokeSize.fY); - const GrScalar rx = dx * 0.5f; - const GrScalar ry = dy * 0.5f; - - GrScalar spare; - { - GrScalar w = rect.width() - dx; - GrScalar h = rect.height() - dy; - spare = GrMin(w, h); - } - - if (spare <= 0) { - GrRect r(rect); - r.inset(-rx, -ry); - fillDevAARect(ctx, paint, r); - return; - } - - GrAutoMatrix avm(ctx, GrMatrix::I()); - - GrPoint verts[16]; - GrPoint* texs = NULL; - GrColor colors[16]; - - setInsetFan(&verts[ 0], rect, -rx - 0.5f, -ry - 0.5f); - setInsetFan(&verts[ 4], rect, -rx + 0.5f, -ry + 0.5f); - setInsetFan(&verts[ 8], rect, rx - 0.5f, ry - 0.5f); - setInsetFan(&verts[12], rect, rx + 0.5f, ry + 0.5f); - - sk_memset32(&colors[ 0], 0, 4); - sk_memset32(&colors[ 4], getColorForMesh(paint), 8); - sk_memset32(&colors[12], 0, 4); - - ctx->drawVertices(paint, kTriangles_PrimitiveType, - 16, verts, texs, colors, - gStrokeAARectIdx, SK_ARRAY_COUNT(gStrokeAARectIdx)); -} - -/* - * If the paint has a texture, preconcat the ctx's inverse, since when we - * draw verts which are already in device coordinates, we need to "undo" that - * before we run our vertex shaders, which expect the coordinates to be local. - */ -static void preConcatInverseToTextureMatrix(GrContext* ctx, GrPaint* paint) { - if (paint->getTexture()) { - GrMatrix inverse; - if (ctx->getMatrix().invert(&inverse)) { - paint->fSampler.preConcatMatrix(inverse); - } - } -} - void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect, const SkPaint& paint) { - CHECK_SHOULD_DRAW(draw); - - const SkMatrix& matrix = *draw.fMatrix; - SkPoint strokeSize; - SkDraw::RectType type = SkDraw::ComputeRectType(paint, matrix, &strokeSize); - - if (SkDraw::kPath_RectType == type) { - SkPath path; - path.addRect(rect); - this->drawPath(draw, path, paint, NULL, true); - } else { - GrPaint grPaint; - SkAutoCachedTexture act; - if (!this->skPaint2GrPaintShader(paint, &act, matrix, &grPaint)) { - return; - } - - bool doAA = paint.isAntiAlias(); - - if (SkDraw::kHair_RectType == type && doAA) { - strokeSize.set(SK_Scalar1, SK_Scalar1); - type = SkDraw::kStroke_RectType; - } - - switch (type) { - case SkDraw::kHair_RectType: - SkASSERT(!doAA); - fContext->drawRect(grPaint, Sk2Gr(rect), 0); - break; - case SkDraw::kFill_RectType: - if (doAA) { - SkRect devRect; - matrix.mapRect(&devRect, rect); - preConcatInverseToTextureMatrix(fContext, &grPaint); - fillDevAARect(fContext, grPaint, Sk2Gr(devRect)); - } else { - fContext->drawRect(grPaint, Sk2Gr(rect), -1); - } - break; - case SkDraw::kStroke_RectType: - if (doAA) { - SkRect devRect; - matrix.mapRect(&devRect, rect); - preConcatInverseToTextureMatrix(fContext, &grPaint); - strokeDevAARect(fContext, grPaint, Sk2Gr(devRect), strokeSize); - } else { - fContext->drawRect(grPaint, Sk2Gr(rect), paint.getStrokeWidth()); - } - break; - default: - SkASSERT(!"bad value for RectType"); - } - } + CHECK_SHOULD_DRAW(draw);
+
+ bool doStroke = paint.getStyle() == SkPaint::kStroke_Style;
+ SkScalar width = paint.getStrokeWidth();
+
+ /*
+ We have special code for hairline strokes, miter-strokes, and fills.
+ Anything else we just call our path code.
+ */
+ bool usePath = doStroke && width > 0 &&
+ paint.getStrokeJoin() != SkPaint::kMiter_Join;
+ // another reason we might need to call drawPath...
+ if (paint.getMaskFilter()) {
+ usePath = true;
+ }
+
+ if (usePath) {
+ SkPath path;
+ path.addRect(rect);
+ this->drawPath(draw, path, paint, NULL, true);
+ return;
+ }
+
+ GrPaint grPaint;
+ SkAutoCachedTexture act;
+ if (!this->skPaint2GrPaintShader(paint, &act, *draw.fMatrix, &grPaint)) {
+ return;
+ }
+ fContext->drawRect(grPaint, Sk2Gr(rect), doStroke ? width : -1); } #include "SkMaskFilter.h" |