src/effects/SkLumaXfermode.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/effects/SkLumaXfermode.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/effects/SkLumaXfermode.cpp

diff --git a/src/effects/SkLumaXfermode.cpp b/src/effects/SkLumaXfermode.cpp

index a23e010366ead4e21cc6251ec75c80097994460d..318275af7ba591caa71a53ac5961ea940f90e04a 100644

--- a/src/effects/SkLumaXfermode.cpp

+++ b/src/effects/SkLumaXfermode.cpp

@@ -213,7 +213,7 @@ void GrGLLumaMaskEffect::emitCode(GrGLShaderBuilder* builder,

const char* dstColor = builder->dstColor();

SkASSERT(NULL != dstColor);

if (NULL == inputColor) {

- inputColor = GrGLSLOnesVecf(4);

+ inputColor = GrGLSLExpr<4>(1).c_str();

}

const char *opA = lumaOpA<char>(lumaEffect.getMode(), inputColor, dstColor);