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/GrGLSLProgramBuilder.h | |
| 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/GrGLSLProgramBuilder.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 952db7e09b..4d253c73bf 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -15,7 +15,7 @@ #include "glsl/GrGLSLPrimitiveProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUniformHandler.h" -#include "glsl/GrGLSLTextureSampler.h" +#include "glsl/GrGLSLSampler.h" #include "glsl/GrGLSLVertexShaderBuilder.h" #include "glsl/GrGLSLXferProcessor.h" @@ -146,8 +146,7 @@ private: const GrGLSLExpr4& coverageIn, bool ignoresCoverage, GrPixelLocalStorageState plsState); - void emitSamplers(const GrProcessor& processor, - GrGLSLTextureSampler::TextureSamplerArray* outSamplers); + void emitSamplers(const GrProcessor& processor, GrGLSLSampler::SamplerArray* outTexSamplers); void emitFSOutputSwizzle(bool hasSecondaryOutput); bool checkSamplerCounts(); |