src/gpu/GrOvalRenderer.cpp - Issue 509153002: Initial change to create GeometryProcessor

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 509153002: Initial change to create GeometryProcessor (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fixing mac compiler warning Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/GrOvalRenderer.cpp

diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp

index f368dc8d899c06e02b63128e3db3f9a0b4a1e784..4dd36beb86f4339fe5e2811a64eda6e274cc2bee 100644

--- a/src/gpu/GrOvalRenderer.cpp

+++ b/src/gpu/GrOvalRenderer.cpp

@@ -553,7 +553,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target,

GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly && innerRadius > 0);

static const int kCircleEdgeAttrIndex = 1;

- drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref();

+ drawState->setGeometryProcessor(effect, kCircleEdgeAttrIndex)->unref();

// The radii are outset for two reasons. First, it allows the shader to simply perform

// clamp(distance-to-center - radius, 0, 1). Second, the outer radius is used to compute the

@@ -696,7 +696,7 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target,

static const int kEllipseCenterAttrIndex = 1;

static const int kEllipseEdgeAttrIndex = 2;

- drawState->addCoverageEffect(effect, kEllipseCenterAttrIndex, kEllipseEdgeAttrIndex)->unref();

+ drawState->setGeometryProcessor(effect, kEllipseCenterAttrIndex, kEllipseEdgeAttrIndex)->unref();

// Compute the reciprocals of the radii here to save time in the shader

SkScalar xRadRecip = SkScalarInvert(xRadius);

@@ -814,7 +814,7 @@ bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target,

static const int kEllipseOuterOffsetAttrIndex = 1;

static const int kEllipseInnerOffsetAttrIndex = 2;

- drawState->addCoverageEffect(effect, kEllipseOuterOffsetAttrIndex,

+ drawState->setGeometryProcessor(effect, kEllipseOuterOffsetAttrIndex,

robertphillips 2014/08/29 15:04:53 Line this next line up ?

kEllipseInnerOffsetAttrIndex)->unref();

// This expands the outer rect so that after CTM we end up with a half-pixel border

@@ -1063,7 +1063,7 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us

GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly);

static const int kCircleEdgeAttrIndex = 1;

- drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref();

+ drawState->setGeometryProcessor(effect, kCircleEdgeAttrIndex)->unref();

// The radii are outset for two reasons. First, it allows the shader to simply perform

// clamp(distance-to-center - radius, 0, 1). Second, the outer radius is used to compute the

@@ -1168,7 +1168,7 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us

GrEffect* effect = EllipseEdgeEffect::Create(isStrokeOnly);

static const int kEllipseOffsetAttrIndex = 1;

static const int kEllipseRadiiAttrIndex = 2;

- drawState->addCoverageEffect(effect,

+ drawState->setGeometryProcessor(effect,

robertphillips 2014/08/29 15:04:53 Line this up ?

joshua.litt 2014/09/02 16:06:21 Acknowledged.

kEllipseOffsetAttrIndex, kEllipseRadiiAttrIndex)->unref();

// Compute the reciprocals of the radii here to save time in the shader

« src/gpu/GrContext.cpp ('K') | « src/gpu/GrDrawTarget.cpp ('k') | src/gpu/GrRODrawState.h » ('j') | src/gpu/gl/GrGLProgramDesc.h » ('J')