diff options
| -rw-r--r-- | include/gpu/GrFragmentProcessor.h | 3 | ||||
| -rw-r--r-- | include/gpu/GrProcessor.h | 9 | ||||
| -rw-r--r-- | src/gpu/GrFragmentProcessor.cpp | 8 |
3 files changed, 4 insertions, 16 deletions
diff --git a/include/gpu/GrFragmentProcessor.h b/include/gpu/GrFragmentProcessor.h index d7011f826c..28b9e0bd4d 100644 --- a/include/gpu/GrFragmentProcessor.h +++ b/include/gpu/GrFragmentProcessor.h @@ -189,9 +189,6 @@ public: &GrProcessor::textureAccess>; protected: - void addTextureAccess(const GrTextureAccess* textureAccess) override; - void addBufferAccess(const GrBufferAccess*) override; - /** * Fragment Processor subclasses call this from their constructor to register coordinate * transformations. Coord transforms provide a mechanism for a processor to receive coordinates diff --git a/include/gpu/GrProcessor.h b/include/gpu/GrProcessor.h index d374a7f3d0..7c9662e585 100644 --- a/include/gpu/GrProcessor.h +++ b/include/gpu/GrProcessor.h @@ -129,8 +129,8 @@ protected: * GrProcessor subclass. These must only be called from the constructor because GrProcessors * are immutable. */ - virtual void addTextureAccess(const GrTextureAccess* textureAccess); - virtual void addBufferAccess(const GrBufferAccess* bufferAccess); + void addTextureAccess(const GrTextureAccess* textureAccess); + void addBufferAccess(const GrBufferAccess* bufferAccess); bool hasSameSamplers(const GrProcessor&) const; @@ -152,9 +152,6 @@ protected: } uint32_t fClassID; - SkSTArray<4, const GrTextureAccess*, true> fTextureAccesses; - SkSTArray<2, const GrBufferAccess*, true> fBufferAccesses; - private: static uint32_t GenClassID() { // fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The @@ -174,6 +171,8 @@ private: static int32_t gCurrProcessorClassID; RequiredFeatures fRequiredFeatures; + SkSTArray<4, const GrTextureAccess*, true> fTextureAccesses; + SkSTArray<2, const GrBufferAccess*, true> fBufferAccesses; typedef GrProgramElement INHERITED; }; diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp index 3f60b4aa0f..1844983416 100644 --- a/src/gpu/GrFragmentProcessor.cpp +++ b/src/gpu/GrFragmentProcessor.cpp @@ -56,14 +56,6 @@ GrGLSLFragmentProcessor* GrFragmentProcessor::createGLSLInstance() const { return glFragProc; } -void GrFragmentProcessor::addTextureAccess(const GrTextureAccess* textureAccess) { - INHERITED::addTextureAccess(textureAccess); -} - -void GrFragmentProcessor::addBufferAccess(const GrBufferAccess* bufferAccess) { - INHERITED::addBufferAccess(bufferAccess); -} - void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) { fCoordTransforms.push_back(transform); fUsesLocalCoords = true; |