diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrDrawTarget.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrGeometryProcessor.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrInOrderDrawBuffer.h | 4 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.h | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.h | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrYUVtoRGBEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLPathRange.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLRenderTarget.h | 6 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLNvprProgramBuilder.h | 2 |
10 files changed, 13 insertions, 15 deletions
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index 770e8852b2..26de8675d5 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -844,7 +844,7 @@ protected: GrClipMaskManager fClipMaskManager; private: - GrClipMaskManager* clipMaskManager() { return &fClipMaskManager; } + GrClipMaskManager* clipMaskManager() SK_OVERRIDE { return &fClipMaskManager; } virtual bool setupClip(const SkRect* devBounds, GrDrawState::AutoRestoreEffects* are, diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h index 50ecac48ba..7481515577 100644 --- a/src/gpu/GrGeometryProcessor.h +++ b/src/gpu/GrGeometryProcessor.h @@ -80,8 +80,6 @@ public: , fHasVertexCoverage(false) , fHasLocalCoords(false) {} - virtual const char* name() const = 0; - /** * Sets a unique key on the GrProcessorKeyBuilder that is directly associated with this geometry * processor's GL backend implementation. @@ -161,7 +159,7 @@ public: virtual void initBatchTracker(GrBatchTracker*, const InitBT&) const {} GrColor color() const { return fColor; } - uint8_t coverage() const { return fCoverage; } + uint8_t coverage() const SK_OVERRIDE { return fCoverage; } // TODO this is a total hack until the gp can own whether or not it uses uniform // color / coverage diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h index 9b850a7849..060e42ee7a 100644 --- a/src/gpu/GrInOrderDrawBuffer.h +++ b/src/gpu/GrInOrderDrawBuffer.h @@ -42,7 +42,7 @@ public: ~GrInOrderDrawBuffer() SK_OVERRIDE; // tracking for draws - DrawToken getCurrentDrawToken() { return DrawToken(this, fDrawID); } + DrawToken getCurrentDrawToken() SK_OVERRIDE { return DrawToken(this, fDrawID); } void clearStencilClip(const SkIRect& rect, bool insideClip, @@ -250,7 +250,7 @@ private: // Records any trace markers for a command after adding it to the buffer. void recordTraceMarkersIfNecessary(); - virtual bool isIssued(uint32_t drawID) { return drawID != fDrawID; } + virtual bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; } // TODO: Use a single allocator for commands and records enum { diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index 9023a630e8..b600f993cd 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -95,7 +95,7 @@ public: const SkPaint& paint, SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE; virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, - int x, int y, const SkPaint& paint); + int x, int y, const SkPaint& paint) SK_OVERRIDE; virtual void drawText(const SkDraw&, const void* text, size_t len, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void drawPosText(const SkDraw&, const void* text, size_t len, diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 1d0950bfa5..0d1226b3aa 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -96,7 +96,7 @@ private: virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const { + virtual 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/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp index 50d0e52d6e..e8c7ff7aca 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp @@ -104,7 +104,7 @@ private: this->addTextureAccess(&fVAccess); } - virtual bool onIsEqual(const GrFragmentProcessor& sBase) const { + virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE { const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>(); return fColorSpace == s.getColorSpace(); } diff --git a/src/gpu/gl/GrGLPathRange.h b/src/gpu/gl/GrGLPathRange.h index 8fde666e7e..5fbfb1f917 100644 --- a/src/gpu/gl/GrGLPathRange.h +++ b/src/gpu/gl/GrGLPathRange.h @@ -42,7 +42,7 @@ public: GrGLuint basePathID() const { return fBasePathID; } protected: - virtual void onInitPath(int index, const SkPath&) const; + virtual void onInitPath(int index, const SkPath&) const SK_OVERRIDE; virtual void onRelease() SK_OVERRIDE; virtual void onAbandon() SK_OVERRIDE; diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h index e66475d92c..079e9d5c53 100644 --- a/src/gpu/gl/GrGLRenderTarget.h +++ b/src/gpu/gl/GrGLRenderTarget.h @@ -42,9 +42,9 @@ public: GrGLuint textureFBOID() const { return fTexFBOID; } // override of GrRenderTarget - virtual GrBackendObject getRenderTargetHandle() const { return this->renderFBOID(); } - virtual GrBackendObject getRenderTargetResolvedHandle() const { return this->textureFBOID(); } - virtual ResolveType getResolveType() const { + virtual GrBackendObject getRenderTargetHandle() const SK_OVERRIDE { return this->renderFBOID(); } + virtual GrBackendObject getRenderTargetResolvedHandle() const SK_OVERRIDE { return this->textureFBOID(); } + virtual ResolveType getResolveType() const SK_OVERRIDE { if (!this->isMultisampled() || fRTFBOID == fTexFBOID) { // catches FBO 0 and non MSAA case diff --git a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h index b25759e795..7f7b0fc41c 100644 --- a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h @@ -14,7 +14,7 @@ class GrGLLegacyNvprProgramBuilder : public GrGLProgramBuilder { public: GrGLLegacyNvprProgramBuilder(GrGpuGL*, const GrOptDrawState&); - virtual GrGLProgram* createProgram(GrGLuint programID); + virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; private: int addTexCoordSets(int count); diff --git a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h index 48fa96c8d7..5f239055fa 100644 --- a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h @@ -25,7 +25,7 @@ public: typedef GrTAllocator<SeparableVaryingInfo> SeparableVaryingInfoArray; - virtual GrGLProgram* createProgram(GrGLuint programID); + virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE; private: virtual void emitTransforms(const GrPendingFragmentStage&, |