| Index: src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp
|
| index fb69472ccacab00664583089fa2090e8c372a062..e92500a29d5e2c45fa3db54d4df88804a439c6f9 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);
|
|
|