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/gpu/glsl/GrGLSLShaderBuilder.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/gpu/glsl/GrGLSLShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp index 795e5cb585..91a0f9b1b5 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp @@ -9,7 +9,7 @@ #include "glsl/GrGLSLShaderBuilder.h" #include "glsl/GrGLSLCaps.h" #include "glsl/GrGLSLShaderVar.h" -#include "glsl/GrGLSLTextureSampler.h" +#include "glsl/GrGLSLSampler.h" #include "glsl/GrGLSLProgramBuilder.h" GrGLSLShaderBuilder::GrGLSLShaderBuilder(GrGLSLProgramBuilder* program) @@ -63,7 +63,7 @@ void GrGLSLShaderBuilder::emitFunction(GrSLType returnType, } void GrGLSLShaderBuilder::appendTextureLookup(SkString* out, - const GrGLSLTextureSampler& sampler, + const GrGLSLSampler& sampler, const char* coordName, GrSLType varyingType) const { const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps(); @@ -103,14 +103,14 @@ void GrGLSLShaderBuilder::appendTextureLookup(SkString* out, } } -void GrGLSLShaderBuilder::appendTextureLookup(const GrGLSLTextureSampler& sampler, +void GrGLSLShaderBuilder::appendTextureLookup(const GrGLSLSampler& sampler, const char* coordName, GrSLType varyingType) { this->appendTextureLookup(&this->code(), sampler, coordName, varyingType); } void GrGLSLShaderBuilder::appendTextureLookupAndModulate(const char* modulation, - const GrGLSLTextureSampler& sampler, + const GrGLSLSampler& sampler, const char* coordName, GrSLType varyingType) { SkString lookup; |