| commit | 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Tue Nov 29 13:43:05 2016 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Tue Nov 29 19:32:31 2016 +0000 |
| tree | 2723f6ec5bfc291d4a52adf961165e3e74a098ca | |
| parent | e11b614795bbe707d131ad599ead5be452e7c06f [diff] [blame] |
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>
diff --git a/src/gpu/effects/GrGammaEffect.h b/src/gpu/effects/GrGammaEffect.h index 3f84ac9..a3e4b0e 100644 --- a/src/gpu/effects/GrGammaEffect.h +++ b/src/gpu/effects/GrGammaEffect.h
@@ -32,7 +32,7 @@ GrGammaEffect(Mode mode, SkScalar gamma); GrGLSLFragmentProcessor* onCreateGLSLInstance() const override; - void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override; + void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override; bool onIsEqual(const GrFragmentProcessor&) const override; void onComputeInvariantOutput(GrInvariantOutput* inout) const override;