diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-29 13:43:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-29 19:32:31 +0000 |
| commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 (patch) | |
| tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca /src/effects/GrAlphaThresholdFragmentProcessor.cpp | |
| parent | e11b614795bbe707d131ad599ead5be452e7c06f (diff) | |
Merge GrGLSLCaps into GrShaderCaps
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121
Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8
Reviewed-on: https://skia-review.googlesource.com/5121
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/effects/GrAlphaThresholdFragmentProcessor.cpp')
| -rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index ed633b0294..afafe08279 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -12,11 +12,11 @@ #include "GrInvariantOutput.h" #include "SkRefCnt.h" -#include "glsl/GrGLSL.h" #include "glsl/GrGLSLColorSpaceXformHelper.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLUniformHandler.h" +#include "../private/GrGLSL.h" sk_sp<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::Make( GrTexture* texture, @@ -85,7 +85,7 @@ class GrGLAlphaThresholdFragmentProcessor : public GrGLSLFragmentProcessor { public: void emitCode(EmitArgs&) override; - static inline void GenKey(const GrProcessor& effect, const GrGLSLCaps&, + static inline void GenKey(const GrProcessor& effect, const GrShaderCaps&, GrProcessorKeyBuilder* b) { const GrAlphaThresholdFragmentProcessor& atfp = effect.cast<GrAlphaThresholdFragmentProcessor>(); @@ -187,7 +187,7 @@ sk_sp<GrFragmentProcessor> GrAlphaThresholdFragmentProcessor::TestCreate(GrProce /////////////////////////////////////////////////////////////////////////////// -void GrAlphaThresholdFragmentProcessor::onGetGLSLProcessorKey(const GrGLSLCaps& caps, +void GrAlphaThresholdFragmentProcessor::onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const { GrGLAlphaThresholdFragmentProcessor::GenKey(*this, caps, b); } |