diff options
author | cdalton <cdalton@nvidia.com> | 2016-04-11 12:18:09 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-11 12:18:09 -0700 |
commit | 3f6f76f98b6b37d17d1492791ff0feb1b7586bd6 (patch) | |
tree | f9d4ea6d87cfe9f1f05626eaac549e163bd00638 /src/effects/SkDisplacementMapEffect.cpp | |
parent | a6b92ad1f7b79106caef6a4c721903544f507a02 (diff) |
Rename EmitArgs::fSamplers to fTexSamplers
Renames fSamplers to fTexSamplers in GrProcessor EmitArgs, and renames
GrGLSLTextureSampler to GrGLSLSampler. This will allow us to add a
second array of buffer samplers.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1862373003
Review URL: https://codereview.chromium.org/1862373003
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
-rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index db0a59a1b9..aee15ef753 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -551,7 +551,7 @@ void GrGLDisplacementMapEffect::emitCode(EmitArgs& args) { GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; fragBuilder->codeAppendf("\t\tvec4 %s = ", dColor); - fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(), + fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fCoords[0].c_str(), args.fCoords[0].getType()); fragBuilder->codeAppend(";\n"); @@ -606,7 +606,7 @@ void GrGLDisplacementMapEffect::emitCode(EmitArgs& args) { domain, args.fOutputColor, SkString(cCoords), - args.fSamplers[1]); + args.fTexSamplers[1]); fragBuilder->codeAppend(";\n"); } |