gm/beziereffects.cpp - Issue 791743003: Remove GP from drawstate, revision of invariant output for GP

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/beziereffects.cpp

Issue 791743003: Remove GP from drawstate, revision of invariant output for GP (Closed) Base URL: https://skia.googlesource.com/skia.git@color-to-gp

Patch Set: cleanup Created 6 years 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: gm/beziereffects.cpp

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp

index 6f19ac93e7c25d1fd6c0ee2a5f6a4ee1f8ea4772..19453372e5213092ce4d6a1504fc187f43429412 100644

--- a/gm/beziereffects.cpp

+++ b/gm/beziereffects.cpp

@@ -164,11 +164,10 @@ protected:

verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);

}

- ds.setGeometryProcessor(gp);

ds.setRenderTarget(rt);

tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());

- tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);

+ tt.target()->drawIndexed(&ds, gp.get(), kTriangleFan_GrPrimitiveType, 0, 0,4,6);

bsalomon 2014/12/10 15:26:59 Can't you just pass gp? I thought it would auto-ca

}

++col;

if (numCols == col) {

@@ -320,11 +319,10 @@ protected:

verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);

}

- ds.setGeometryProcessor(gp);

ds.setRenderTarget(rt);

tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());

- tt.target()->drawIndexed(&ds, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);

+ tt.target()->drawIndexed(&ds, gp.get(), kTriangleFan_GrPrimitiveType, 0, 0,4,6);

}

++col;

if (numCols == col) {

@@ -505,11 +503,10 @@ protected:

GrPathUtils::QuadUVMatrix DevToUV(pts);

DevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts);

- ds.setGeometryProcessor(gp);

ds.setRenderTarget(rt);

tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());

- tt.target()->drawIndexed(&ds, kTriangles_GrPrimitiveType, 0, 0, 4, 6);

+ tt.target()->drawIndexed(&ds, gp.get(), kTriangles_GrPrimitiveType, 0, 0, 4, 6);

}

++col;

if (numCols == col) {

« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | gm/convexpolyeffect.cpp » ('j') | include/gpu/GrInvariantOutput.h » ('J')