diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/debugger/SkOverdrawMode.cpp | 2 | ||||
-rw-r--r-- | tools/gpu/GrContextFactory.h | 2 | ||||
-rw-r--r-- | tools/gpu/GrTest.cpp | 4 | ||||
-rw-r--r-- | tools/gpu/GrTest.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrBufferObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrFakeRefObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrFrameBufferObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrProgramObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrRenderBufferObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrShaderObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrTextureObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrTextureUnitObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/debug/GrVertexArrayObj.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp | 2 | ||||
-rw-r--r-- | tools/gpu/gl/null/NullGLTestContext.cpp | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/tools/debugger/SkOverdrawMode.cpp b/tools/debugger/SkOverdrawMode.cpp index 58b47edc8c..b17354e19b 100644 --- a/tools/debugger/SkOverdrawMode.cpp +++ b/tools/debugger/SkOverdrawMode.cpp @@ -192,7 +192,7 @@ private: outColorSecondary, proc); } - void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override { }; + void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override { } typedef GrGLSLXferProcessor INHERITED; }; diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h index d5e87a42f4..a822ac7868 100644 --- a/tools/gpu/GrContextFactory.h +++ b/tools/gpu/GrContextFactory.h @@ -24,7 +24,7 @@ public: ContextInfo() = default; ContextInfo& operator=(const ContextInfo&) = default; - GrBackend backend() const { return fBackend; }; + GrBackend backend() const { return fBackend; } GrContext* grContext() const { return fGrContext; } diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 8a64ebcbf2..b99cf06d60 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -299,7 +299,7 @@ public: bool onCopySurface(GrSurface* dst, GrSurface* src, const SkIRect& srcRect, - const SkIPoint& dstPoint) override { return false; }; + const SkIPoint& dstPoint) override { return false; } void onGetMultisampleSpecs(GrRenderTarget* rt, const GrStencilSettings&, int* effectiveSampleCnt, SamplePattern*) override { @@ -316,7 +316,7 @@ public: return nullptr; } - void drawDebugWireRect(GrRenderTarget*, const SkIRect&, GrColor) override {}; + void drawDebugWireRect(GrRenderTarget*, const SkIRect&, GrColor) override {} private: void onResetContext(uint32_t resetBits) override {} diff --git a/tools/gpu/GrTest.h b/tools/gpu/GrTest.h index 7c94c9fc30..7b05a05146 100644 --- a/tools/gpu/GrTest.h +++ b/tools/gpu/GrTest.h @@ -25,7 +25,7 @@ namespace GrTest { GrContext. In the future this object may provide some guards to prevent this. */ class GrTestTarget { public: - GrTestTarget() {}; + GrTestTarget() {} void init(GrContext*, sk_sp<GrDrawContext>); diff --git a/tools/gpu/gl/debug/GrBufferObj.h b/tools/gpu/gl/debug/GrBufferObj.h index 96aef6ed0a..c91606da92 100644 --- a/tools/gpu/gl/debug/GrBufferObj.h +++ b/tools/gpu/gl/debug/GrBufferObj.h @@ -14,7 +14,7 @@ //////////////////////////////////////////////////////////////////////////////// class GrBufferObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrBufferObj); + GR_DEFINE_CREATOR(GrBufferObj) public: GrBufferObj() diff --git a/tools/gpu/gl/debug/GrFakeRefObj.h b/tools/gpu/gl/debug/GrFakeRefObj.h index 30580516fa..e59aeb3594 100644 --- a/tools/gpu/gl/debug/GrFakeRefObj.h +++ b/tools/gpu/gl/debug/GrFakeRefObj.h @@ -30,7 +30,7 @@ public: fID = ++fNextID; } - virtual ~GrFakeRefObj() {}; + virtual ~GrFakeRefObj() {} void ref() { fRef++; diff --git a/tools/gpu/gl/debug/GrFrameBufferObj.h b/tools/gpu/gl/debug/GrFrameBufferObj.h index 42a0effe07..3bd642f460 100644 --- a/tools/gpu/gl/debug/GrFrameBufferObj.h +++ b/tools/gpu/gl/debug/GrFrameBufferObj.h @@ -16,7 +16,7 @@ class GrFBBindableObj; // TODO: when a framebuffer obj is bound the GL_SAMPLES query must return 0 // TODO: GL_STENCIL_BITS must also be redirected to the framebuffer class GrFrameBufferObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrFrameBufferObj); + GR_DEFINE_CREATOR(GrFrameBufferObj) public: GrFrameBufferObj() diff --git a/tools/gpu/gl/debug/GrProgramObj.h b/tools/gpu/gl/debug/GrProgramObj.h index a25341a215..f4ff9d1967 100644 --- a/tools/gpu/gl/debug/GrProgramObj.h +++ b/tools/gpu/gl/debug/GrProgramObj.h @@ -15,7 +15,7 @@ class GrShaderObj; //////////////////////////////////////////////////////////////////////////////// class GrProgramObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrProgramObj); + GR_DEFINE_CREATOR(GrProgramObj) public: GrProgramObj() diff --git a/tools/gpu/gl/debug/GrRenderBufferObj.h b/tools/gpu/gl/debug/GrRenderBufferObj.h index 134b9ec763..1802eb551e 100644 --- a/tools/gpu/gl/debug/GrRenderBufferObj.h +++ b/tools/gpu/gl/debug/GrRenderBufferObj.h @@ -13,7 +13,7 @@ //////////////////////////////////////////////////////////////////////////////// class GrRenderBufferObj : public GrFBBindableObj { - GR_DEFINE_CREATOR(GrRenderBufferObj); + GR_DEFINE_CREATOR(GrRenderBufferObj) public: GrRenderBufferObj() diff --git a/tools/gpu/gl/debug/GrShaderObj.h b/tools/gpu/gl/debug/GrShaderObj.h index 327bd7f084..8ecb9901f6 100644 --- a/tools/gpu/gl/debug/GrShaderObj.h +++ b/tools/gpu/gl/debug/GrShaderObj.h @@ -14,7 +14,7 @@ //////////////////////////////////////////////////////////////////////////////// class GrShaderObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrShaderObj); + GR_DEFINE_CREATOR(GrShaderObj) public: GrShaderObj() diff --git a/tools/gpu/gl/debug/GrTextureObj.h b/tools/gpu/gl/debug/GrTextureObj.h index fcf851db86..e2908386cb 100644 --- a/tools/gpu/gl/debug/GrTextureObj.h +++ b/tools/gpu/gl/debug/GrTextureObj.h @@ -15,7 +15,7 @@ class GrTextureUnitObj; //////////////////////////////////////////////////////////////////////////////// class GrTextureObj : public GrFBBindableObj { - GR_DEFINE_CREATOR(GrTextureObj); + GR_DEFINE_CREATOR(GrTextureObj) public: GrTextureObj() diff --git a/tools/gpu/gl/debug/GrTextureUnitObj.h b/tools/gpu/gl/debug/GrTextureUnitObj.h index 5c7a03980b..b06d117255 100644 --- a/tools/gpu/gl/debug/GrTextureUnitObj.h +++ b/tools/gpu/gl/debug/GrTextureUnitObj.h @@ -16,7 +16,7 @@ class GrTextureObj; // GL emulation objects they are derived from GrFakeRefObj to provide some // uniformity in how the debug interface class manages resources class GrTextureUnitObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrTextureUnitObj); + GR_DEFINE_CREATOR(GrTextureUnitObj) public: GrTextureUnitObj() diff --git a/tools/gpu/gl/debug/GrVertexArrayObj.h b/tools/gpu/gl/debug/GrVertexArrayObj.h index 989c610924..3aeb0b2f4c 100644 --- a/tools/gpu/gl/debug/GrVertexArrayObj.h +++ b/tools/gpu/gl/debug/GrVertexArrayObj.h @@ -11,7 +11,7 @@ #include "GrFakeRefObj.h" class GrVertexArrayObj : public GrFakeRefObj { - GR_DEFINE_CREATOR(GrVertexArrayObj); + GR_DEFINE_CREATOR(GrVertexArrayObj) public: GrVertexArrayObj() : GrFakeRefObj() {} diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp index 9cff0b7357..b8e1996d37 100644 --- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp +++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp @@ -74,7 +74,7 @@ private: static Display* get_display() { class AutoDisplay { public: - AutoDisplay() { fDisplay = XOpenDisplay(nullptr); }; + AutoDisplay() { fDisplay = XOpenDisplay(nullptr); } ~AutoDisplay() { if (fDisplay) { XCloseDisplay(fDisplay); diff --git a/tools/gpu/gl/null/NullGLTestContext.cpp b/tools/gpu/gl/null/NullGLTestContext.cpp index 56236a45a6..dcb6231bcb 100644 --- a/tools/gpu/gl/null/NullGLTestContext.cpp +++ b/tools/gpu/gl/null/NullGLTestContext.cpp @@ -21,7 +21,7 @@ public: ~NullGLContext() override { this->teardown(); } private: - void onPlatformMakeCurrent() const override {}; + void onPlatformMakeCurrent() const override {} void onPlatformSwapBuffers() const override {} GrGLFuncPtr onPlatformGetProcAddress(const char*) const override { return nullptr; } }; |