src/gpu/effects/GrConvolutionEffect.cpp - Issue 1417123002: Move GrGLShaderVar to GrGLSL

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

Issue 1417123002: Move GrGLShaderVar to GrGLSL (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix gyp Created 5 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/effects/GrConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp

index 071106e0c8977d79c7c5a5d356003858bebdd00b..ef4e791fb225cab840a8bbadb3ebd7eefa12146d 100644

--- a/src/gpu/effects/GrConvolutionEffect.cpp

+++ b/src/gpu/effects/GrConvolutionEffect.cpp

@@ -65,7 +65,7 @@ void GrGLConvolutionEffect::emitCode(EmitArgs& args) {

fsBuilder->codeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", args.fOutputColor);

int width = this->width();

- const GrGLShaderVar& kernel = args.fBuilder->getUniformVariable(fKernelUni);

+ const GrGLSLShaderVar& kernel = args.fBuilder->getUniformVariable(fKernelUni);

const char* imgInc = args.fBuilder->getUniformCStr(fImageIncrementUni);

fsBuilder->codeAppendf("\t\tvec2 coord = %s - %d.0 * %s;\n", coords2D.c_str(), fRadius, imgInc);