diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-18 11:58:54 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 18:01:43 +0000 |
| commit | 101b844d6ba031de5c4e95b43f9292f266799237 (patch) | |
| tree | 138593a7d161695e26b691db6557fd1b22914b4d /src/gpu/glsl/GrGLSLUniformHandler.h | |
| parent | 3502c5cc736f131674147ed19f1942f83f5fb9a4 (diff) | |
Remove GrGLSLSampler type and subclasses
GrGLSLUniformManager and GrGLSLProgramDataManager subclasses handle sampler variation across GPU backends.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5002
Change-Id: I968b006bab978c2fa209d1f7eda710c298d1212f
Reviewed-on: https://skia-review.googlesource.com/5002
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLUniformHandler.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLUniformHandler.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/glsl/GrGLSLUniformHandler.h index d7b213869c..657be6a804 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/glsl/GrGLSLUniformHandler.h @@ -12,7 +12,6 @@ #include "GrGLSLShaderVar.h" class GrGLSLProgramBuilder; -class GrGLSLSampler; class GrGLSLUniformHandler { public: @@ -61,22 +60,11 @@ protected: GrGLSLProgramBuilder* fProgramBuilder; private: - virtual int numSamplers() const = 0; - virtual const GrGLSLSampler& getSampler(SamplerHandle handle) const = 0; + virtual const GrGLSLShaderVar& samplerVariable(SamplerHandle) const = 0; + virtual GrSwizzle samplerSwizzle(SamplerHandle) const = 0; - SamplerHandle addSampler(uint32_t visibility, - GrPixelConfig config, - GrSLType type, - GrSLPrecision precision, - const char* name) { - return this->internalAddSampler(visibility, config, type, precision, name); - } - - virtual SamplerHandle internalAddSampler(uint32_t visibility, - GrPixelConfig config, - GrSLType type, - GrSLPrecision precision, - const char* name) = 0; + virtual SamplerHandle addSampler(uint32_t visibility, GrSwizzle, GrSLType, GrSLPrecision, + const char* name) = 0; virtual UniformHandle internalAddUniformArray(uint32_t visibility, GrSLType type, |