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/GrGLSLProgramBuilder.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/GrGLSLProgramBuilder.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 8a8cff55ad..727614455f 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -16,7 +16,6 @@ #include "glsl/GrGLSLPrimitiveProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUniformHandler.h" -#include "glsl/GrGLSLSampler.h" #include "glsl/GrGLSLVertexShaderBuilder.h" #include "glsl/GrGLSLXferProcessor.h" @@ -44,7 +43,13 @@ public: typedef GrGLSLUniformHandler::SamplerHandle SamplerHandle; - const GrGLSLSampler& getSampler(SamplerHandle handle) const; + const GrGLSLShaderVar& samplerVariable(SamplerHandle handle) const { + return this->uniformHandler()->samplerVariable(handle); + } + + GrSwizzle samplerSwizzle(SamplerHandle handle) const { + return this->uniformHandler()->samplerSwizzle(handle); + } // Handles for program uniforms (other than per-effect uniforms) struct BuiltinUniformHandles { |