diff options
Diffstat (limited to 'src/gpu/effects')
24 files changed, 126 insertions, 126 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index e846b79b25..e16601dee1 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -24,7 +24,7 @@ public: GrGLConicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -258,7 +258,7 @@ public: GrGLQuadEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -478,7 +478,7 @@ public: GrGLCubicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index 1bd93b64c9..f31542f4db 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -90,7 +90,7 @@ public: virtual ~GrConicEffect(); - virtual const char* name() const SK_OVERRIDE { return "Conic"; } + const char* name() const SK_OVERRIDE { return "Conic"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; } @@ -102,7 +102,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -113,9 +113,9 @@ private: GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -174,7 +174,7 @@ public: virtual ~GrQuadEffect(); - virtual const char* name() const SK_OVERRIDE { return "Quad"; } + const char* name() const SK_OVERRIDE { return "Quad"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; } @@ -186,7 +186,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -197,9 +197,9 @@ private: GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } @@ -254,7 +254,7 @@ public: virtual ~GrCubicEffect(); - virtual const char* name() const SK_OVERRIDE { return "Cubic"; } + const char* name() const SK_OVERRIDE { return "Cubic"; } inline const GrAttribute* inPosition() const { return fInPosition; } inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; } @@ -266,7 +266,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -276,9 +276,9 @@ public: private: GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { out->setUnknownSingleComponent(); } diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 76edff0dc6..7d2dbf4a09 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -30,7 +30,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor& effect, const GrGLCaps&, GrProcessorKeyBuilder* b) { diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h index 19fce03c7f..89e43c121b 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -25,11 +25,11 @@ public: const float* coefficients() const { return fCoefficients; } - virtual const char* name() const SK_OVERRIDE { return "Bicubic"; } + const char* name() const SK_OVERRIDE { return "Bicubic"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureDomain& domain() const { return fDomain; } @@ -91,9 +91,9 @@ private: const SkMatrix &matrix, const SkShader::TileMode tileModes[2]); GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix, const SkRect& domain); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; float fCoefficients[16]; GrTextureDomain fDomain; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 5f44d32318..1cfb64414b 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -25,7 +25,7 @@ public: GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>(); const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>(); diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index c69ffd7a1b..85e4f421e1 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -30,7 +30,7 @@ public: virtual ~GrBitmapTextGeoProc() {} - virtual const char* name() const SK_OVERRIDE { return "Texture"; } + const char* name() const SK_OVERRIDE { return "Texture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -40,7 +40,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE; bool onCanMakeEqual(const GrBatchTracker&, @@ -51,9 +51,9 @@ private: GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params, bool useColorAttrib, bool opaqueVertexColors, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; const GrAttribute* fInPosition; diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index d85e783c27..5760bb4c16 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -37,11 +37,11 @@ public: static const GrFragmentProcessor* Create(GrTexture*, bool swapRedAndBlue, PMConversion, const SkMatrix&); - virtual const char* name() const SK_OVERRIDE { return "Config Conversion"; } + const char* name() const SK_OVERRIDE { return "Config Conversion"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; bool swapsRedAndBlue() const { return fSwapRedAndBlue; } PMConversion pmConversion() const { return fPMConversion; } @@ -61,9 +61,9 @@ private: PMConversion pmConversion, const SkMatrix& matrix); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; bool fSwapRedAndBlue; PMConversion fPMConversion; diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 14307165e3..7035094fa6 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -23,11 +23,11 @@ public: GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } - virtual const char* name() const SK_OVERRIDE { return "AARect"; } + const char* name() const SK_OVERRIDE { return "AARect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect) @@ -36,12 +36,12 @@ private: this->setWillReadFragmentPosition(); } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { const AARectEffect& aare = other.cast<AARectEffect>(); return fRect == aare.fRect; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { if (fRect.isEmpty()) { // An empty rect will have no coverage anywhere. inout->mulByKnownSingleComponent(0); @@ -94,7 +94,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fRectUniform; @@ -189,7 +189,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fEdgeUniform; diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h index fec7e82b0e..e0eee5d369 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -61,7 +61,7 @@ public: virtual ~GrConvexPolyEffect(); - virtual const char* name() const SK_OVERRIDE { return "ConvexPoly"; } + const char* name() const SK_OVERRIDE { return "ConvexPoly"; } GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } @@ -69,16 +69,16 @@ public: const SkScalar* getEdges() const { return fEdges; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; int fEdgeCount; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index e3f051b0eb..ef892dcd0b 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -25,7 +25,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 0d1226b3aa..4ea436c227 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -57,11 +57,11 @@ public: const float* bounds() const { return fBounds; } bool useBounds() const { return fUseBounds; } - virtual const char* name() const SK_OVERRIDE { return "Convolution"; } + const char* name() const SK_OVERRIDE { return "Convolution"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; enum { // This was decided based on the min allowed value for the max texture @@ -94,9 +94,9 @@ private: bool useBounds, float bounds[2]); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // If the texture was opaque we could know that the output color if we knew the sum of the // kernel values. inout->mulByUnknownFourComponents(); diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 47b8d65a22..8b69dca9d2 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -478,7 +478,7 @@ public: virtual ~DashingCircleEffect(); - virtual const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; } + const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; } const GrAttribute* inPosition() const { return fInPosition; } @@ -496,7 +496,7 @@ public: const GrGLCaps&, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -508,9 +508,9 @@ private: DashingCircleEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info, SkScalar radius, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; const GrAttribute* fInPosition; @@ -530,7 +530,7 @@ class GLDashingCircleEffect : public GrGLGeometryProcessor { public: GLDashingCircleEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -767,7 +767,7 @@ public: virtual ~DashingLineEffect(); - virtual const char* name() const SK_OVERRIDE { return "DashingEffect"; } + const char* name() const SK_OVERRIDE { return "DashingEffect"; } const GrAttribute* inPosition() const { return fInPosition; } @@ -783,7 +783,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -795,9 +795,9 @@ private: DashingLineEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info, SkScalar strokeWidth, const SkMatrix& localMatrix); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrPrimitiveEdgeType fEdgeType; const GrAttribute* fInPosition; @@ -816,7 +816,7 @@ class GLDashingLineEffect : public GrGLGeometryProcessor { public: GLDashingLineEffect(const GrGeometryProcessor&, const GrBatchTracker&); - virtual void emitCode(const EmitArgs&) SK_OVERRIDE; + void emitCode(const EmitArgs&) SK_OVERRIDE; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp index 21fbb307c1..cdb6ff75e1 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp @@ -35,7 +35,7 @@ public: #endif {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldTextureEffect>(); const DistanceFieldBatchTracker& local = args.fBT.cast<DistanceFieldBatchTracker>(); @@ -321,7 +321,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL), fTextureSize(SkISize::Make(-1, -1)) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldNoGammaTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldNoGammaTextureEffect>(); @@ -562,7 +562,7 @@ public: , fTextureSize(SkISize::Make(-1,-1)) , fTextColor(GrColor_ILLEGAL) {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrDistanceFieldLCDTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldLCDTextureEffect>(); const DistanceFieldLCDBatchTracker& local = args.fBT.cast<DistanceFieldLCDBatchTracker>(); diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h index 1be06df936..6edcf988d2 100644 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.h +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h @@ -66,7 +66,7 @@ public: virtual ~GrDistanceFieldTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -80,7 +80,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -96,9 +96,9 @@ private: #endif uint32_t flags, bool opaqueVertexColors); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; #ifdef SK_GAMMA_APPLY_TO_A8 @@ -133,7 +133,7 @@ public: virtual ~GrDistanceFieldNoGammaTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inColor() const { return fInColor; } @@ -144,7 +144,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -157,9 +157,9 @@ private: const GrTextureParams& params, uint32_t flags, bool opaqueVertexColors); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; uint32_t fFlags; @@ -190,7 +190,7 @@ public: virtual ~GrDistanceFieldLCDTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } + const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } const GrAttribute* inPosition() const { return fInPosition; } const GrAttribute* inTextureCoords() const { return fInTextureCoords; } @@ -201,7 +201,7 @@ public: const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; + GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; @@ -215,9 +215,9 @@ private: GrTexture* gamma, const GrTextureParams& gammaParams, SkColor textColor, uint32_t flags); - virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; - virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; GrTextureAccess fTextureAccess; GrTextureAccess fGammaTextureAccess; diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 799d970601..5e73e3bf50 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -24,11 +24,11 @@ public: virtual ~DitherEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Dither"; } + const char* name() const SK_OVERRIDE { return "Dither"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: DitherEffect() { @@ -37,9 +37,9 @@ private: } // All dither effects are equal - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 6a710995a2..30f5b5e767 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -22,7 +22,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: typedef GrGLProgramDataManager::UniformHandle UniformHandle; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 8d6bb7cc10..8f92175fae 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -60,11 +60,11 @@ public: bool convolveAlpha() const { return fConvolveAlpha; } const GrTextureDomain& domain() const { return fDomain; } - virtual const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } + const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrMatrixConvolutionEffect(GrTexture*, @@ -77,9 +77,9 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // TODO: Try to do better? inout->mulByUnknownFourComponents(); } diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index f1d1e68f29..314b000819 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -22,11 +22,11 @@ public: virtual ~CircleEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Circle"; } + const char* name() const SK_OVERRIDE { return "Circle"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkPoint& getCenter() const { return fCenter; } SkScalar getRadius() const { return fRadius; } @@ -36,9 +36,9 @@ public: private: CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkScalar fRadius; @@ -106,7 +106,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fCircleUniform; @@ -197,11 +197,11 @@ public: virtual ~EllipseEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "Ellipse"; } + const char* name() const SK_OVERRIDE { return "Ellipse"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkPoint& getCenter() const { return fCenter; } SkVector getRadii() const { return fRadii; } @@ -211,9 +211,9 @@ public: private: EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkVector fRadii; @@ -284,7 +284,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fEllipseUniform; diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 2b10cadbf1..aecf685e62 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -38,7 +38,7 @@ public: virtual ~GrGLPorterDuffXferProcessor() {} - virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { + void emitCode(const EmitArgs& args) SK_OVERRIDE { const GrPorterDuffXferProcessor& xp = args.fXP.cast<GrPorterDuffXferProcessor>(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); if (xp.hasSecondaryOutput()) { @@ -86,7 +86,7 @@ public: } } - virtual void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, GrProcessorKeyBuilder* b) { diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 1c1bd18791..2cc0651f41 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -48,11 +48,11 @@ public: virtual ~CircularRRectEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "CircularRRect"; } + const char* name() const SK_OVERRIDE { return "CircularRRect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkRRect& getRRect() const { return fRRect; } @@ -63,9 +63,9 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -141,7 +141,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; @@ -392,11 +392,11 @@ public: virtual ~EllipticalRRectEffect() {}; - virtual const char* name() const SK_OVERRIDE { return "EllipticalRRect"; } + const char* name() const SK_OVERRIDE { return "EllipticalRRect"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const SkRRect& getRRect() const { return fRRect; } @@ -405,9 +405,9 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -498,7 +498,7 @@ public: static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 4b9268df24..8afc23583e 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -47,11 +47,11 @@ public: virtual ~GrSimpleTextureEffect() {} - virtual const char* name() const SK_OVERRIDE { return "SimpleTexture"; } + const char* name() const SK_OVERRIDE { return "SimpleTexture"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; private: GrSimpleTextureEffect(GrTexture* texture, @@ -70,9 +70,9 @@ private: this->initClassID<GrSimpleTextureEffect>(); } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 3531106ca8..9516595e60 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -176,7 +176,7 @@ public: const TransformedCoordsArray&, const TextureSamplerArray&) SK_OVERRIDE; - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h index 9e21c4a48e..3d8b5691c4 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -153,11 +153,11 @@ public: virtual ~GrTextureDomainEffect(); - virtual const char* name() const SK_OVERRIDE { return "TextureDomain"; } + const char* name() const SK_OVERRIDE { return "TextureDomain"; } - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; const GrTextureDomain& textureDomain() const { return fTextureDomain; } @@ -172,9 +172,9 @@ private: GrTextureParams::FilterMode, GrCoordSet); - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index e8c7ff7aca..736135282c 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -22,7 +22,7 @@ public: return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture, colorSpace)); } - virtual const char* name() const SK_OVERRIDE { return "YUV to RGB"; } + const char* name() const SK_OVERRIDE { return "YUV to RGB"; } SkYUVColorSpace getColorSpace() const { return fColorSpace; @@ -83,7 +83,7 @@ public: GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -104,12 +104,12 @@ private: this->addTextureAccess(&fVAccess); } - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>(); return fColorSpace == s.getColorSpace(); } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { // YUV is opaque inout->setToOther(kA_GrColorComponentFlag, 0xFF << GrColor_SHIFT_A, GrInvariantOutput::kWillNot_ReadInput); |