diff options
Diffstat (limited to 'src/gpu/effects')
31 files changed, 246 insertions, 246 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index 158fd5d896..90b91b0bd2 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -24,7 +24,7 @@ public: GrGLConicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - void onEmitCode(EmitArgs&, GrGPArgs*) SK_OVERRIDE; + void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -33,7 +33,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { this->setUniformViewMatrix(pdman, primProc.viewMatrix()); const ConicBatchTracker& local = bt.cast<ConicBatchTracker>(); @@ -259,7 +259,7 @@ public: GrGLQuadEffect(const GrGeometryProcessor&, const GrBatchTracker&); - void onEmitCode(EmitArgs&, GrGPArgs*) SK_OVERRIDE; + void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -268,7 +268,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { this->setUniformViewMatrix(pdman, primProc.viewMatrix()); const QuadBatchTracker& local = bt.cast<QuadBatchTracker>(); @@ -480,7 +480,7 @@ public: GrGLCubicEffect(const GrGeometryProcessor&, const GrBatchTracker&); - void onEmitCode(EmitArgs&, GrGPArgs*) SK_OVERRIDE; + void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -489,7 +489,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& primProc, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { this->setUniformViewMatrix(pdman, primProc.viewMatrix()); const CubicBatchTracker& local = bt.cast<CubicBatchTracker>(); diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index b0039e955f..3390924243 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -90,7 +90,7 @@ public: virtual ~GrConicEffect(); - const char* name() const SK_OVERRIDE { return "Conic"; } + const char* name() const override { return "Conic"; } inline const Attribute* inPosition() const { return fInPosition; } inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; } @@ -100,23 +100,23 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { out->setUnknownSingleComponent(); } @@ -175,7 +175,7 @@ public: virtual ~GrQuadEffect(); - const char* name() const SK_OVERRIDE { return "Quad"; } + const char* name() const override { return "Quad"; } inline const Attribute* inPosition() const { return fInPosition; } inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; } @@ -185,23 +185,23 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, const SkMatrix& localMatrix); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { out->setUnknownSingleComponent(); } @@ -256,7 +256,7 @@ public: virtual ~GrCubicEffect(); - const char* name() const SK_OVERRIDE { return "Cubic"; } + const char* name() const override { return "Cubic"; } inline const Attribute* inPosition() const { return fInPosition; } inline const Attribute* inCubicCoeffs() const { return fInCubicCoeffs; } @@ -266,22 +266,22 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const override { out->setUnknownSingleComponent(); } diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp index 7d2dbf4a09..06d228e02a 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/effects/GrBicubicEffect.cpp @@ -28,9 +28,9 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) 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 89e43c121b..ddbdd23437 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/effects/GrBicubicEffect.h @@ -25,11 +25,11 @@ public: const float* coefficients() const { return fCoefficients; } - const char* name() const SK_OVERRIDE { return "Bicubic"; } + const char* name() const override { return "Bicubic"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const 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); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; float fCoefficients[16]; GrTextureDomain fDomain; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 2c187a9dcf..25904f753f 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -26,7 +26,7 @@ public: GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) SK_OVERRIDE{ + void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>(); const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>(); @@ -78,7 +78,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& gp, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { this->setUniformViewMatrix(pdman, gp.viewMatrix()); const BitmapTextBatchTracker& local = bt.cast<BitmapTextBatchTracker>(); diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index b5a4145367..05f740fb57 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -30,7 +30,7 @@ public: virtual ~GrBitmapTextGeoProc() {} - const char* name() const SK_OVERRIDE { return "Texture"; } + const char* name() const override { return "Texture"; } const Attribute* inPosition() const { return fInPosition; } const Attribute* inColor() const { return fInColor; } @@ -39,25 +39,25 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps& caps) const SK_OVERRIDE; + const GrGLCaps& caps) const override; - void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params, GrMaskFormat format, bool opaqueVertexColors, const SkMatrix& localMatrix); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputColor(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputColor(GrInitInvariantOutput*) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrTextureAccess fTextureAccess; const Attribute* fInPosition; diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index fedc4707bc..27f8abf108 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -27,7 +27,7 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray& coords, - const TextureSamplerArray& samplers) SK_OVERRIDE { + const TextureSamplerArray& samplers) override { // Using highp for GLES here in order to avoid some precision issues on specific GPUs. GrGLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, kHigh_GrSLPrecision); SkString tmpDecl; diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index 5760bb4c16..9be71f8277 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&); - const char* name() const SK_OVERRIDE { return "Config Conversion"; } + const char* name() const override { return "Config Conversion"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; bool swapsRedAndBlue() const { return fSwapRedAndBlue; } PMConversion pmConversion() const { return fPMConversion; } @@ -61,9 +61,9 @@ private: PMConversion pmConversion, const SkMatrix& matrix); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; bool fSwapRedAndBlue; PMConversion fPMConversion; diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 7035094fa6..a231df495d 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -23,11 +23,11 @@ public: GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } - const char* name() const SK_OVERRIDE { return "AARect"; } + const char* name() const override { return "AARect"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; private: AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect) @@ -36,12 +36,12 @@ private: this->setWillReadFragmentPosition(); } - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const override { const AARectEffect& aare = other.cast<AARectEffect>(); return fRect == aare.fRect; } - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const override { if (fRect.isEmpty()) { // An empty rect will have no coverage anywhere. inout->mulByKnownSingleComponent(0); @@ -90,11 +90,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fRectUniform; @@ -185,11 +185,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fEdgeUniform; diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h index e0eee5d369..f47cc37afa 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/effects/GrConvexPolyEffect.h @@ -61,7 +61,7 @@ public: virtual ~GrConvexPolyEffect(); - const char* name() const SK_OVERRIDE { return "ConvexPoly"; } + const char* name() const override { return "ConvexPoly"; } GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } @@ -69,16 +69,16 @@ public: const SkScalar* getEdges() const { return fEdges; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; private: GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]); - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GrPrimitiveEdgeType fEdgeType; int fEdgeCount; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index ef892dcd0b..401cac3a3c 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -23,9 +23,9 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; - void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) 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 4ea436c227..fa6329aa50 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; } - const char* name() const SK_OVERRIDE { return "Convolution"; } + const char* name() const override { return "Convolution"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const 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]); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const 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/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 6f49a1d504..a5e9b2fc74 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -21,30 +21,30 @@ public: return SkNEW_ARGS(CoverageSetOpXP, (regionOp, invertCoverage)); } - ~CoverageSetOpXP() SK_OVERRIDE; + ~CoverageSetOpXP() override; - const char* name() const SK_OVERRIDE { return "Coverage Set Op"; } + const char* name() const override { return "Coverage Set Op"; } - GrGLXferProcessor* createGLInstance() const SK_OVERRIDE; + GrGLXferProcessor* createGLInstance() const override; - bool hasSecondaryOutput() const SK_OVERRIDE { return false; } + bool hasSecondaryOutput() const override { return false; } GrXferProcessor::OptFlags getOptimizations(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, bool doesStencilWrite, GrColor* color, - const GrDrawTargetCaps& caps) SK_OVERRIDE; + const GrDrawTargetCaps& caps) override; - void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const SK_OVERRIDE; + void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override; bool invertCoverage() const { return fInvertCoverage; } private: CoverageSetOpXP(SkRegion::Op regionOp, bool fInvertCoverage); - void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; + void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const override; - bool onIsEqual(const GrXferProcessor& xpBase) const SK_OVERRIDE { + bool onIsEqual(const GrXferProcessor& xpBase) const override { const CoverageSetOpXP& xp = xpBase.cast<CoverageSetOpXP>(); return (fRegionOp == xp.fRegionOp && fInvertCoverage == xp.fInvertCoverage); @@ -62,7 +62,7 @@ class GLCoverageSetOpXP : public GrGLXferProcessor { public: GLCoverageSetOpXP(const GrProcessor&) {} - ~GLCoverageSetOpXP() SK_OVERRIDE {} + ~GLCoverageSetOpXP() override {} static void GenKey(const GrProcessor& processor, const GrGLCaps& caps, GrProcessorKeyBuilder* b) { @@ -72,7 +72,7 @@ public: }; private: - void onEmitCode(const EmitArgs& args) SK_OVERRIDE { + void onEmitCode(const EmitArgs& args) override { const CoverageSetOpXP& xp = args.fXP.cast<CoverageSetOpXP>(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); @@ -83,7 +83,7 @@ private: } } - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {}; typedef GrGLXferProcessor INHERITED; }; diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index e4d65e41e4..1ab807e116 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -407,14 +407,14 @@ GrFragmentProcessor* GrCustomXfermode::CreateFP(SkXfermode::Mode mode, GrTexture class GLCustomXferFP : public GrGLFragmentProcessor { public: GLCustomXferFP(const GrFragmentProcessor&) {} - ~GLCustomXferFP() SK_OVERRIDE {}; + ~GLCustomXferFP() override {}; void emitCode(GrGLFPBuilder* builder, const GrFragmentProcessor& fp, const char* outputColor, const char* inputColor, const TransformedCoordsArray& coords, - const TextureSamplerArray& samplers) SK_OVERRIDE { + const TextureSamplerArray& samplers) override { SkXfermode::Mode mode = fp.cast<GrCustomXferFP>().mode(); GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* dstColor = "bgColor"; @@ -425,7 +425,7 @@ public: emit_custom_xfermode_code(mode, fsBuilder, outputColor, inputColor, dstColor); } - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE {} + void setData(const GrGLProgramDataManager&, const GrProcessor&) override {} static void GenKey(const GrFragmentProcessor& proc, const GrGLCaps&, GrProcessorKeyBuilder* b) { // The background may come from the dst or from a texture. @@ -495,21 +495,21 @@ public: } } - ~CustomXP() SK_OVERRIDE {}; + ~CustomXP() override {}; - const char* name() const SK_OVERRIDE { return "Custom Xfermode"; } + const char* name() const override { return "Custom Xfermode"; } - GrGLXferProcessor* createGLInstance() const SK_OVERRIDE; + GrGLXferProcessor* createGLInstance() const override; - bool hasSecondaryOutput() const SK_OVERRIDE { return false; } + bool hasSecondaryOutput() const override { return false; } GrXferProcessor::OptFlags getOptimizations(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, bool doesStencilWrite, GrColor* overrideColor, - const GrDrawTargetCaps& caps) SK_OVERRIDE; + const GrDrawTargetCaps& caps) override; - void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const SK_OVERRIDE { + void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override { blendInfo->fSrcBlend = kOne_GrBlendCoeff; blendInfo->fDstBlend = kZero_GrBlendCoeff; blendInfo->fBlendConstant = 0; @@ -520,9 +520,9 @@ public: private: CustomXP(SkXfermode::Mode mode, const GrDeviceCoordTexture* dstCopy, bool willReadDstColor); - void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; + void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const override; - bool onIsEqual(const GrXferProcessor& xpBase) const SK_OVERRIDE; + bool onIsEqual(const GrXferProcessor& xpBase) const override; SkXfermode::Mode fMode; @@ -544,7 +544,7 @@ GrXPFactory* GrCustomXfermode::CreateXPFactory(SkXfermode::Mode mode) { class GLCustomXP : public GrGLXferProcessor { public: GLCustomXP(const GrXferProcessor&) {} - ~GLCustomXP() SK_OVERRIDE {} + ~GLCustomXP() override {} static void GenKey(const GrXferProcessor& proc, const GrGLCaps&, GrProcessorKeyBuilder* b) { uint32_t key = proc.numTextures(); @@ -554,7 +554,7 @@ public: } private: - void onEmitCode(const EmitArgs& args) SK_OVERRIDE { + void onEmitCode(const EmitArgs& args) override { SkXfermode::Mode mode = args.fXP.cast<CustomXP>().mode(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); const char* dstColor = fsBuilder->dstColor(); @@ -566,7 +566,7 @@ private: args.fInputCoverage, dstColor); } - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {} + void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {} typedef GrGLFragmentProcessor INHERITED; }; diff --git a/src/gpu/effects/GrCustomXfermodePriv.h b/src/gpu/effects/GrCustomXfermodePriv.h index 85092a9892..98883e04fa 100644 --- a/src/gpu/effects/GrCustomXfermodePriv.h +++ b/src/gpu/effects/GrCustomXfermodePriv.h @@ -29,19 +29,19 @@ class GrCustomXferFP : public GrFragmentProcessor { public: GrCustomXferFP(SkXfermode::Mode mode, GrTexture* background); - void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; - const char* name() const SK_OVERRIDE { return "Custom Xfermode"; } + const char* name() const override { return "Custom Xfermode"; } SkXfermode::Mode mode() const { return fMode; } const GrTextureAccess& backgroundAccess() const { return fBackgroundAccess; } private: - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; @@ -60,30 +60,30 @@ class GrCustomXPFactory : public GrXPFactory { public: GrCustomXPFactory(SkXfermode::Mode mode); - bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const SK_OVERRIDE { + bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const override { return true; } - bool canTweakAlphaForCoverage() const SK_OVERRIDE { + bool canTweakAlphaForCoverage() const override { return false; } void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput*) const SK_OVERRIDE; + GrXPFactory::InvariantOutput*) const override; private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, - const GrProcOptInfo& coveragePOI) const SK_OVERRIDE { + const GrProcOptInfo& coveragePOI) const override { return true; } - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { const GrCustomXPFactory& xpf = xpfBase.cast<GrCustomXPFactory>(); return fMode == xpf.fMode; } diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index eb0467cef4..a64cf5b130 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -257,17 +257,17 @@ public: return SkNEW_ARGS(DashBatch, (geometry, cap, useAA, fullDash)); } - const char* name() const SK_OVERRIDE { return "DashBatch"; } + const char* name() const override { return "DashBatch"; } - void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE { + void getInvariantOutputColor(GrInitInvariantOutput* out) const override { // When this is called on a batch, there is only one geometry bundle out->setKnownFourComponents(fGeoData[0].fColor); } - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE { + void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override { out->setUnknownSingleComponent(); } - void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE { + void initBatchTracker(const GrPipelineInfo& init) override { // Handle any color overrides if (init.fColorIgnored) { fGeoData[0].fColor = GrColor_ILLEGAL; @@ -293,7 +293,7 @@ public: bool fHasEndRect; }; - void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) SK_OVERRIDE { + void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override { int instanceCount = fGeoData.count(); SkMatrix invert; @@ -633,7 +633,7 @@ private: fBatch.fFullDash = fullDash; } - bool onCombineIfPossible(GrBatch* t) SK_OVERRIDE { + bool onCombineIfPossible(GrBatch* t) override { DashBatch* that = t->cast<DashBatch>(); if (this->useAA() != that->useAA()) { @@ -775,7 +775,7 @@ public: virtual ~DashingCircleEffect(); - const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; } + const char* name() const override { return "DashingCircleEffect"; } const Attribute* inPosition() const { return fInPosition; } @@ -787,23 +787,23 @@ public: virtual void getGLProcessorKey(const GrBatchTracker&, const GrGLCaps&, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker&, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: DashingCircleEffect(GrColor, GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrPrimitiveEdgeType fEdgeType; const Attribute* fInPosition; @@ -821,7 +821,7 @@ class GLDashingCircleEffect : public GrGLGeometryProcessor { public: GLDashingCircleEffect(const GrGeometryProcessor&, const GrBatchTracker&); - void onEmitCode(EmitArgs&, GrGPArgs*) SK_OVERRIDE; + void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -830,7 +830,7 @@ public: virtual void setData(const GrGLProgramDataManager&, const GrPrimitiveProcessor&, - const GrBatchTracker&) SK_OVERRIDE; + const GrBatchTracker&) override; private: UniformHandle fParamUniform; @@ -1024,7 +1024,7 @@ public: virtual ~DashingLineEffect(); - const char* name() const SK_OVERRIDE { return "DashingEffect"; } + const char* name() const override { return "DashingEffect"; } const Attribute* inPosition() const { return fInPosition; } @@ -1036,23 +1036,23 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: DashingLineEffect(GrColor, GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrPrimitiveEdgeType fEdgeType; const Attribute* fInPosition; @@ -1070,7 +1070,7 @@ class GLDashingLineEffect : public GrGLGeometryProcessor { public: GLDashingLineEffect(const GrGeometryProcessor&, const GrBatchTracker&); - void onEmitCode(EmitArgs&, GrGPArgs*) SK_OVERRIDE; + void onEmitCode(EmitArgs&, GrGPArgs*) override; static inline void GenKey(const GrGeometryProcessor&, const GrBatchTracker&, @@ -1079,7 +1079,7 @@ public: virtual void setData(const GrGLProgramDataManager&, const GrPrimitiveProcessor&, - const GrBatchTracker&) SK_OVERRIDE; + const GrBatchTracker&) override; private: GrColor fColor; diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp index d97589dcb6..776d804fd2 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/effects/GrDisableColorXP.cpp @@ -21,30 +21,30 @@ public: return SkNEW(DisableColorXP); } - ~DisableColorXP() SK_OVERRIDE {}; + ~DisableColorXP() override {}; - const char* name() const SK_OVERRIDE { return "Disable Color"; } + const char* name() const override { return "Disable Color"; } - GrGLXferProcessor* createGLInstance() const SK_OVERRIDE; + GrGLXferProcessor* createGLInstance() const override; - bool hasSecondaryOutput() const SK_OVERRIDE { return false; } + bool hasSecondaryOutput() const override { return false; } GrXferProcessor::OptFlags getOptimizations(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, bool doesStencilWrite, GrColor* color, - const GrDrawTargetCaps& caps) SK_OVERRIDE { + const GrDrawTargetCaps& caps) override { return GrXferProcessor::kIgnoreColor_OptFlag | GrXferProcessor::kIgnoreCoverage_OptFlag; } - void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const SK_OVERRIDE; + void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override; private: DisableColorXP(); - void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; + void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const override; - bool onIsEqual(const GrXferProcessor& xpBase) const SK_OVERRIDE { + bool onIsEqual(const GrXferProcessor& xpBase) const override { return true; } @@ -57,12 +57,12 @@ class GLDisableColorXP : public GrGLXferProcessor { public: GLDisableColorXP(const GrProcessor&) {} - ~GLDisableColorXP() SK_OVERRIDE {} + ~GLDisableColorXP() override {} static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*) {} private: - void onEmitCode(const EmitArgs& args) SK_OVERRIDE { + void onEmitCode(const EmitArgs& args) override { // This emit code should be empty. However, on the nexus 6 there is a driver bug where if // you do not give gl_FragColor a value, the gl context is lost and we end up drawing // nothing. So this fix just sets the gl_FragColor arbitrarily to 0. @@ -70,7 +70,7 @@ private: fsBuilder->codeAppendf("%s = vec4(0);", args.fOutputPrimary); } - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {} + void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {} typedef GrGLXferProcessor INHERITED; }; diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h index fb855ee520..9bbe24d757 100644 --- a/src/gpu/effects/GrDisableColorXP.h +++ b/src/gpu/effects/GrDisableColorXP.h @@ -19,14 +19,14 @@ public: return SkNEW(GrDisableColorXPFactory); } - bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const SK_OVERRIDE { + bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const override { return true; } - bool canTweakAlphaForCoverage() const SK_OVERRIDE { return true; } + bool canTweakAlphaForCoverage() const override { return true; } void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput* output) const SK_OVERRIDE { + GrXPFactory::InvariantOutput* output) const override { output->fBlendedColorFlags = 0; output->fWillBlendWithDst = 0; } @@ -37,15 +37,15 @@ private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, - const GrProcOptInfo& coveragePOI) const SK_OVERRIDE { + const GrProcOptInfo& coveragePOI) const override { return false; } - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { return true; } diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp index 2309edf064..0acf1f324a 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp @@ -35,7 +35,7 @@ public: #endif {} - void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) SK_OVERRIDE{ + void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const GrDistanceFieldTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldTextureEffect>(); const DistanceFieldBatchTracker& local = args.fBT.cast<DistanceFieldBatchTracker>(); @@ -139,7 +139,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& proc, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { #ifdef SK_GAMMA_APPLY_TO_A8 const GrDistanceFieldTextureEffect& dfTexEffect = proc.cast<GrDistanceFieldTextureEffect>(); @@ -319,7 +319,7 @@ public: const GrBatchTracker&) : fColor(GrColor_ILLEGAL), fTextureSize(SkISize::Make(-1, -1)) {} - void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) SK_OVERRIDE{ + void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const GrDistanceFieldNoGammaTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldNoGammaTextureEffect>(); @@ -409,7 +409,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& proc, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { SkASSERT(fTextureSizeUni.isValid()); GrTexture* texture = proc.texture(0); @@ -566,7 +566,7 @@ public: : fColor(GrColor_ILLEGAL) , fTextColor(GrColor_ILLEGAL) {} - void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) SK_OVERRIDE{ + void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{ const GrDistanceFieldLCDTextureEffect& dfTexEffect = args.fGP.cast<GrDistanceFieldLCDTextureEffect>(); const DistanceFieldLCDBatchTracker& local = args.fBT.cast<DistanceFieldLCDBatchTracker>(); @@ -713,7 +713,7 @@ public: virtual void setData(const GrGLProgramDataManager& pdman, const GrPrimitiveProcessor& processor, - const GrBatchTracker& bt) SK_OVERRIDE { + const GrBatchTracker& bt) override { SkASSERT(fTextColorUni.isValid()); const GrDistanceFieldLCDTextureEffect& dfTexEffect = diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h index 33209a5254..e05af7684c 100644 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.h +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h @@ -66,7 +66,7 @@ public: virtual ~GrDistanceFieldTextureEffect() {} - const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const override { return "DistanceFieldTexture"; } const Attribute* inPosition() const { return fInPosition; } const Attribute* inColor() const { return fInColor; } @@ -78,16 +78,16 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrDistanceFieldTextureEffect(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, @@ -97,9 +97,9 @@ private: #endif uint32_t flags, bool opaqueVertexColors); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrTextureAccess fTextureAccess; #ifdef SK_GAMMA_APPLY_TO_A8 @@ -134,7 +134,7 @@ public: virtual ~GrDistanceFieldNoGammaTextureEffect() {} - const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } + const char* name() const override { return "DistanceFieldTexture"; } const Attribute* inPosition() const { return fInPosition; } const Attribute* inColor() const { return fInColor; } @@ -143,25 +143,25 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrDistanceFieldNoGammaTextureEffect(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, const GrTextureParams& params, uint32_t flags, bool opaqueVertexColors); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrTextureAccess fTextureAccess; uint32_t fFlags; @@ -192,7 +192,7 @@ public: virtual ~GrDistanceFieldLCDTextureEffect() {} - const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } + const char* name() const override { return "DistanceFieldLCDTexture"; } const Attribute* inPosition() const { return fInPosition; } const Attribute* inTextureCoords() const { return fInTextureCoords; } @@ -201,16 +201,16 @@ public: virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps&) const SK_OVERRIDE; + const GrGLCaps&) const override; - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const override; bool onCanMakeEqual(const GrBatchTracker&, const GrGeometryProcessor&, - const GrBatchTracker&) const SK_OVERRIDE; + const GrBatchTracker&) const override; private: GrDistanceFieldLCDTextureEffect(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, @@ -218,9 +218,9 @@ private: GrTexture* gamma, const GrTextureParams& gammaParams, SkColor textColor, uint32_t flags); - bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrGeometryProcessor& other) const override; - void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; + void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override; GrTextureAccess fTextureAccess; GrTextureAccess fGammaTextureAccess; diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 5e73e3bf50..3a962b02f4 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -24,11 +24,11 @@ public: virtual ~DitherEffect() {}; - const char* name() const SK_OVERRIDE { return "Dither"; } + const char* name() const override { return "Dither"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; private: DitherEffect() { @@ -37,9 +37,9 @@ private: } // All dither effects are equal - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const override { return true; } - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; @@ -72,7 +72,7 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; private: typedef GrGLFragmentProcessor INHERITED; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index c1949737a2..cd6d7c1f86 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -18,11 +18,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: typedef GrGLProgramDataManager::UniformHandle UniformHandle; diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 8f92175fae..33d4141da6 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; } - const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } + const char* name() const override { return "MatrixConvolution"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; private: GrMatrixConvolutionEffect(GrTexture*, @@ -77,9 +77,9 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const override { // TODO: Try to do better? inout->mulByUnknownFourComponents(); } diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 314b000819..0adbb67b9c 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -22,11 +22,11 @@ public: virtual ~CircleEffect() {}; - const char* name() const SK_OVERRIDE { return "Circle"; } + const char* name() const override { return "Circle"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const 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); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; SkPoint fCenter; SkScalar fRadius; @@ -102,11 +102,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fCircleUniform; @@ -197,11 +197,11 @@ public: virtual ~EllipseEffect() {}; - const char* name() const SK_OVERRIDE { return "Ellipse"; } + const char* name() const override { return "Ellipse"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const 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); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; SkPoint fCenter; SkVector fRadii; @@ -280,11 +280,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fEllipseUniform; diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 4453c8935d..2735ac3c22 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -41,13 +41,13 @@ public: willReadDstColor)); } - ~PorterDuffXferProcessor() SK_OVERRIDE; + ~PorterDuffXferProcessor() override; - const char* name() const SK_OVERRIDE { return "Porter Duff"; } + const char* name() const override { return "Porter Duff"; } - GrGLXferProcessor* createGLInstance() const SK_OVERRIDE; + GrGLXferProcessor* createGLInstance() const override; - bool hasSecondaryOutput() const SK_OVERRIDE; + bool hasSecondaryOutput() const override; /////////////////////////////////////////////////////////////////////////// /// @name Stage Output Types @@ -88,9 +88,9 @@ public: const GrProcOptInfo& coveragePOI, bool doesStencilWrite, GrColor* overrideColor, - const GrDrawTargetCaps& caps) SK_OVERRIDE; + const GrDrawTargetCaps& caps) override; - void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const SK_OVERRIDE { + void getBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override { if (!this->willReadDstColor()) { blendInfo->fSrcBlend = fSrcBlend; blendInfo->fDstBlend = fDstBlend; @@ -108,9 +108,9 @@ private: PorterDuffXferProcessor(GrBlendCoeff srcBlend, GrBlendCoeff dstBlend, GrColor constant, const GrDeviceCoordTexture* dstCopy, bool willReadDstColor); - void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; + void onGetGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const override; - bool onIsEqual(const GrXferProcessor& xpBase) const SK_OVERRIDE { + bool onIsEqual(const GrXferProcessor& xpBase) const override { const PorterDuffXferProcessor& xp = xpBase.cast<PorterDuffXferProcessor>(); if (fSrcBlend != xp.fSrcBlend || fDstBlend != xp.fDstBlend || @@ -202,7 +202,7 @@ public: }; private: - void onEmitCode(const EmitArgs& args) SK_OVERRIDE { + void onEmitCode(const EmitArgs& args) override { const PorterDuffXferProcessor& xp = args.fXP.cast<PorterDuffXferProcessor>(); GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); if (PorterDuffXferProcessor::kCustom_PrimaryOutputType != xp.primaryOutputType()) { @@ -267,7 +267,7 @@ private: } } - void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {}; + void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {}; typedef GrGLXferProcessor INHERITED; }; diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 2cc0651f41..24d5077d48 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -48,11 +48,11 @@ public: virtual ~CircularRRectEffect() {}; - const char* name() const SK_OVERRIDE { return "CircularRRect"; } + const char* name() const override { return "CircularRRect"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -63,9 +63,9 @@ public: private: CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -137,11 +137,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; @@ -392,11 +392,11 @@ public: virtual ~EllipticalRRectEffect() {}; - const char* name() const SK_OVERRIDE { return "EllipticalRRect"; } + const char* name() const override { return "EllipticalRRect"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; const SkRRect& getRRect() const { return fRRect; } @@ -405,9 +405,9 @@ public: private: EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&); - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor& other) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; SkRRect fRRect; GrPrimitiveEdgeType fEdgeType; @@ -494,11 +494,11 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) override; private: GrGLProgramDataManager::UniformHandle fInnerRectUniform; diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 93f7d68249..76eece4af1 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -23,7 +23,7 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray& coords, - const TextureSamplerArray& samplers) SK_OVERRIDE { + const TextureSamplerArray& samplers) override { GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t%s = ", outputColor); fsBuilder->appendTextureLookupAndModulate(inputColor, diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 8afc23583e..21d0398a73 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -47,11 +47,11 @@ public: virtual ~GrSimpleTextureEffect() {} - const char* name() const SK_OVERRIDE { return "SimpleTexture"; } + const char* name() const override { return "SimpleTexture"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; private: GrSimpleTextureEffect(GrTexture* texture, @@ -70,9 +70,9 @@ private: this->initClassID<GrSimpleTextureEffect>(); } - bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor& other) const override { return true; } - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 9516595e60..d2a8d70455 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -174,9 +174,9 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray&, - const TextureSamplerArray&) SK_OVERRIDE; + const TextureSamplerArray&) override; - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; + void setData(const GrGLProgramDataManager&, const GrProcessor&) 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 3d8b5691c4..7efd9f2dee 100644 --- a/src/gpu/effects/GrTextureDomain.h +++ b/src/gpu/effects/GrTextureDomain.h @@ -153,11 +153,11 @@ public: virtual ~GrTextureDomainEffect(); - const char* name() const SK_OVERRIDE { return "TextureDomain"; } + const char* name() const override { return "TextureDomain"; } - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE; + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override; - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const override; const GrTextureDomain& textureDomain() const { return fTextureDomain; } @@ -172,9 +172,9 @@ private: GrTextureParams::FilterMode, GrCoordSet); - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; + bool onIsEqual(const GrFragmentProcessor&) const override; - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GR_DECLARE_FRAGMENT_PROCESSOR_TEST; diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index fb69472cca..e92500a29d 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -44,7 +44,7 @@ public: uvFilterMode, colorSpace)); } - const char* name() const SK_OVERRIDE { return "YUV to RGB"; } + const char* name() const override { return "YUV to RGB"; } SkYUVColorSpace getColorSpace() const { return fColorSpace; @@ -65,7 +65,7 @@ public: const char* outputColor, const char* inputColor, const TransformedCoordsArray& coords, - const TextureSamplerArray& samplers) SK_OVERRIDE { + const TextureSamplerArray& samplers) override { GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); const char* yuvMatrix = NULL; @@ -82,7 +82,7 @@ public: } virtual void setData(const GrGLProgramDataManager& pdman, - const GrProcessor& processor) SK_OVERRIDE { + const GrProcessor& processor) override { const YUVtoRGBEffect& yuvEffect = processor.cast<YUVtoRGBEffect>(); switch (yuvEffect.getColorSpace()) { case kJPEG_SkYUVColorSpace: @@ -101,11 +101,11 @@ public: }; virtual void getGLProcessorKey(const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE { + GrProcessorKeyBuilder* b) const override { GLProcessor::GenKey(*this, caps, b); } - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLProcessor, (*this)); } @@ -129,12 +129,12 @@ private: this->addTextureAccess(&fVAccess); } - bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& sBase) const override { const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>(); return fColorSpace == s.getColorSpace(); } - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const override { // YUV is opaque inout->setToOther(kA_GrColorComponentFlag, 0xFF << GrColor_SHIFT_A, GrInvariantOutput::kWillNot_ReadInput); |