src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp - Issue 551253004: Changes to remove program effects builder

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/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

Issue 551253004: Changes to remove program effects builder (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase Created 6 years, 3 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/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

index 4c474b28dc3631bffba0b0282ca6674ce4d6a750..720dc6345d5014cf3da0a4c9d66bfd386fbd14d0 100644

--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

@@ -240,11 +240,11 @@ void GLEdge2PtConicalEffect::emitCode(GrGLProgramBuilder* builder,

builder->getUniformVariable(fParamUni).appendArrayAccess(2, &p2);

// We interpolate the linear component in coords[1].

- SkASSERT(coords[0].type() == coords[1].type());

+ SkASSERT(coords[0].getType() == coords[1].getType());

const char* coords2D;

SkString bVar;

GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

- if (kVec3f_GrSLType == coords[0].type()) {

+ if (kVec3f_GrSLType == coords[0].getType()) {

fsBuilder->codeAppendf("\tvec3 interpolants = vec3(%s.xy / %s.z, %s.x / %s.z);\n",

coords[0].c_str(), coords[0].c_str(), coords[1].c_str(),

coords[1].c_str());