src/gpu/gl/builders/GrGLShaderBuilder.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/gpu/gl/builders/GrGLShaderBuilder.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/gpu/gl/builders/GrGLShaderBuilder.cpp

diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.cpp b/src/gpu/gl/builders/GrGLShaderBuilder.cpp

index 004e09b37bae6c57fc092d51fec20a4a68c4269e..33474e60d4366e029e4db798248fa42f355c4713 100644

--- a/src/gpu/gl/builders/GrGLShaderBuilder.cpp

+++ b/src/gpu/gl/builders/GrGLShaderBuilder.cpp

@@ -97,7 +97,7 @@ void GrGLShaderBuilder::appendTextureLookup(SkString* out,

GrSLType varyingType) const {

append_texture_lookup(out,

fProgramBuilder->gpu(),

- fProgramBuilder->getUniformCStr(sampler.samplerUniform()),

+ fProgramBuilder->getUniformCStr(sampler.fSamplerUniform),

coordName,

sampler.configComponentMask(),

sampler.swizzle(),