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.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/GrGLSLShaderBuilder.h')
-rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/glsl/GrGLSLShaderBuilder.h index cddf7b2db4..6f8bf68bab 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLShaderBuilder.h @@ -15,7 +15,7 @@ #include <stdarg.h> class GrGLSLProgramBuilder; -class GrGLSLTextureSampler; +class GrGLSLSampler; /** base class for all shaders builders @@ -27,25 +27,25 @@ public: /** Appends a 2D texture sample with projection if necessary. coordType must either be Vec2f or Vec3f. The latter is interpreted as projective texture coords. The vec length and swizzle - order of the result depends on the GrTextureAccess associated with the GrGLSLTextureSampler. + order of the result depends on the GrTextureAccess associated with the GrGLSLSampler. */ void appendTextureLookup(SkString* out, - const GrGLSLTextureSampler&, + const GrGLSLSampler&, const char* coordName, GrSLType coordType = kVec2f_GrSLType) const; /** Version of above that appends the result to the fragment shader code instead.*/ - void appendTextureLookup(const GrGLSLTextureSampler&, + void appendTextureLookup(const GrGLSLSampler&, const char* coordName, GrSLType coordType = kVec2f_GrSLType); /** Does the work of appendTextureLookup and modulates the result by modulation. The result is - always a vec4. modulation and the swizzle specified by GrGLSLTextureSampler must both be + always a vec4. modulation and the swizzle specified by GrGLSLSampler must both be vec4 or float. If modulation is "" or nullptr it this function acts as though appendTextureLookup were called. */ void appendTextureLookupAndModulate(const char* modulation, - const GrGLSLTextureSampler&, + const GrGLSLSampler&, const char* coordName, GrSLType coordType = kVec2f_GrSLType); |