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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 1e78788600..7dea0be761 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -295,8 +295,9 @@ void GrGLSLProgramBuilder::emitSampler(GrSLType samplerType, ++fNumFragmentSamplers; } GrSLPrecision precision = this->glslCaps()->samplerPrecision(config, visibility); + GrSwizzle swizzle = this->glslCaps()->configTextureSwizzle(config); SamplerHandle handle = this->uniformHandler()->addSampler(visibility, - config, + swizzle, samplerType, precision, name); @@ -390,9 +391,6 @@ void GrGLSLProgramBuilder::appendUniformDecls(GrShaderFlags visibility, SkString this->uniformHandler()->appendUniformDecls(visibility, out); } -const GrGLSLSampler& GrGLSLProgramBuilder::getSampler(SamplerHandle handle) const { - return this->uniformHandler()->getSampler(handle); -} void GrGLSLProgramBuilder::addRTAdjustmentUniform(GrSLPrecision precision, const char* name, |