src/gpu/GrAAConvexPathRenderer.cpp - Issue 25048002: Express (GLSL expression, possibly known value) pairs as a class

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: src/gpu/GrAAConvexPathRenderer.cpp

Issue 25048002: Express (GLSL expression, possibly known value) pairs as a class (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebase Created 7 years, 2 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:

Index: src/gpu/GrAAConvexPathRenderer.cpp

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

index 7063440ba43c18ff6676b8c0e5aacfc0e1e1ccd6..0f99fe652a5808ceac47a2041479caa139281a1c 100644

--- a/src/gpu/GrAAConvexPathRenderer.cpp

+++ b/src/gpu/GrAAConvexPathRenderer.cpp

@@ -560,9 +560,9 @@ public:

builder->fsCodeAppendf("\t\t\tedgeAlpha = "

"clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n\t\t}\n");

- SkString modulate;

- GrGLSLModulatef<4>(&modulate, inputColor, "edgeAlpha");

- builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str());

+ builder->fsCodeAppendf("\t%s = %s;\n", outputColor,

+ (GrGLSLExpr<4>(inputColor) * GrGLSLExpr<1>("edgeAlpha")).c_str());

vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());

}