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 /tests/PrimitiveProcessorTest.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 'tests/PrimitiveProcessorTest.cpp')
| -rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 4900ed6e84..9a338a8af5 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -62,7 +62,7 @@ private: } const char* name() const override { return "Dummy GP"; } - GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { + GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps&) const override { class GLSLGP : public GrGLSLGeometryProcessor { public: void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override { @@ -79,7 +79,7 @@ private: }; return new GLSLGP(); } - void getGLSLProcessorKey(const GrGLSLCaps&, + void getGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder* builder) const override { builder->add32(this->numAttribs()); } |