| Index: include/gpu/GrFragmentProcessor.h
|
| diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h
|
| index 428466212cd28780da74fbd8b2dc3b3e71c3e6da..b0ef6b5845e1d82d89e343e79f3fe36da18c0949 100644
|
| --- a/include/gpu/GrFragmentProcessor.h
|
| +++ b/include/gpu/GrFragmentProcessor.h
|
| @@ -63,12 +63,12 @@ public:
|
|
|
| ~GrFragmentProcessor() override;
|
|
|
| - GrGLSLFragmentProcessor* createGLInstance() const;
|
| + GrGLSLFragmentProcessor* createGLSLInstance() const;
|
|
|
| - void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| - this->onGetGLProcessorKey(caps, b);
|
| + void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
|
| + this->onGetGLSLProcessorKey(caps, b);
|
| for (int i = 0; i < fChildProcessors.count(); ++i) {
|
| - fChildProcessors[i]->getGLProcessorKey(caps, b);
|
| + fChildProcessors[i]->getGLSLProcessorKey(caps, b);
|
| }
|
| }
|
|
|
| @@ -104,7 +104,8 @@ public:
|
| from getFactory()).
|
|
|
| A return value of true from isEqual() should not be used to test whether the processor would
|
| - generate the same shader code. To test for identical code generation use getGLProcessorKey*/
|
| + generate the same shader code. To test for identical code generation use getGLSLProcessorKey
|
| + */
|
| bool isEqual(const GrFragmentProcessor& that, bool ignoreCoordTransforms) const;
|
|
|
| /**
|
| @@ -166,11 +167,11 @@ private:
|
| /** Returns a new instance of the appropriate *GL* implementation class
|
| for the given GrFragmentProcessor; caller is responsible for deleting
|
| the object. */
|
| - virtual GrGLSLFragmentProcessor* onCreateGLInstance() const = 0;
|
| + virtual GrGLSLFragmentProcessor* onCreateGLSLInstance() const = 0;
|
|
|
| /** Implemented using GLFragmentProcessor::GenKey as described in this class's comment. */
|
| - virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
|
| - GrProcessorKeyBuilder* b) const = 0;
|
| + virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
|
| + GrProcessorKeyBuilder* b) const = 0;
|
|
|
| /**
|
| * Subclass implements this to support isEqual(). It will only be called if it is known that
|
|
|