AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make addTexture/BufferAccess on GrProcessor non-virtual

Browse Source 
Perhaps these needed to be virtual in the past, but no longer.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4120

Change-Id: I1ba713a1da713f2c7955c0cfc9931917f2719a63
Reviewed-on: https://skia-review.googlesource.com/4120
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2016-10-28 11:25:52 -04:00 committed by Skia Commit-Bot
parent b6c5e53796
commit 55e0346f4b
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/gpu/GrFragmentProcessor.h
View File

@ -189,9 +189,6 @@ public:
&GrProcessor::textureAccess>; &GrProcessor::textureAccess>;
protected: protected:
void addTextureAccess(const GrTextureAccess* textureAccess) override;
void addBufferAccess(const GrBufferAccess*) override;
/** /**
* Fragment Processor subclasses call this from their constructor to register coordinate * Fragment Processor subclasses call this from their constructor to register coordinate
* transformations. Coord transforms provide a mechanism for a processor to receive coordinates * transformations. Coord transforms provide a mechanism for a processor to receive coordinates

9
include/gpu/GrProcessor.h
View File

@ -129,8 +129,8 @@ protected:
* GrProcessor subclass. These must only be called from the constructor because GrProcessors * GrProcessor subclass. These must only be called from the constructor because GrProcessors
* are immutable. * are immutable.
*/ */
virtual void addTextureAccess(const GrTextureAccess* textureAccess); void addTextureAccess(const GrTextureAccess* textureAccess);
virtual void addBufferAccess(const GrBufferAccess* bufferAccess); void addBufferAccess(const GrBufferAccess* bufferAccess);
bool hasSameSamplers(const GrProcessor&) const; bool hasSameSamplers(const GrProcessor&) const;
@ -152,9 +152,6 @@ protected:
} }
uint32_t fClassID; uint32_t fClassID;
SkSTArray<4, const GrTextureAccess*, true> fTextureAccesses;
SkSTArray<2, const GrBufferAccess*, true> fBufferAccesses;
private: private:
static uint32_t GenClassID() { static uint32_t GenClassID() {
// fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The // fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The
@ -174,6 +171,8 @@ private:
static int32_t gCurrProcessorClassID; static int32_t gCurrProcessorClassID;
RequiredFeatures fRequiredFeatures; RequiredFeatures fRequiredFeatures;
SkSTArray<4, const GrTextureAccess*, true> fTextureAccesses;
SkSTArray<2, const GrBufferAccess*, true> fBufferAccesses;
typedef GrProgramElement INHERITED; typedef GrProgramElement INHERITED;
}; };

8
src/gpu/GrFragmentProcessor.cpp
View File

@ -56,14 +56,6 @@ GrGLSLFragmentProcessor* GrFragmentProcessor::createGLSLInstance() const {
return glFragProc; 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) { void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) {
fCoordTransforms.push_back(transform); fCoordTransforms.push_back(transform);
fUsesLocalCoords = true; fUsesLocalCoords = true;