aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-08-19 11:05:39 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-19 11:05:39 -0700
commit790d74f7c1db73e2938eee6a6eb78bc29be7b851 (patch)
treeb0ad976ed8124d6ffd485bae4da08b355f6dc570 /include/gpu
parent3b44dcf078d7365c11b5a20916a9b18a75498b56 (diff)
No need to re-declare pure virtual name().
Fixes inconsistent override warning. BUG=skia: TBR=bsalomon@google.com Review URL: https://codereview.chromium.org/1293413003
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/GrFragmentProcessor.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h
index f08d3656b7..097925bb2a 100644
--- a/include/gpu/GrFragmentProcessor.h
+++ b/include/gpu/GrFragmentProcessor.h
@@ -31,10 +31,6 @@ public:
GrGLFragmentProcessor* createGLInstance() const;
- /** Human-meaningful string to identify this GrFragmentProcessor; may be embedded
- in generated shader code. */
- virtual const char* name() const = 0;
-
void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
this->onGetGLProcessorKey(caps, b);
for (int i = 0; i < fChildProcessors.count(); ++i) {
@@ -99,11 +95,11 @@ protected:
* fragment the matrix will be applied to the local coordinate that maps to the fragment.
*
* When the transformation has perspective, the transformed coordinates will have
- * 3 components. Otherwise they'll have 2.
+ * 3 components. Otherwise they'll have 2.
*
* This must only be called from the constructor because GrProcessors are immutable. The
* processor subclass manages the lifetime of the transformations (this function only stores a
- * pointer). The GrCoordTransform is typically a member field of the GrProcessor subclass.
+ * pointer). The GrCoordTransform is typically a member field of the GrProcessor subclass.
*
* A processor subclass that has multiple methods of construction should always add its coord
* transforms in a consistent order. The non-virtual implementation of isEqual() automatically