From 2421b9901b295f0c6381b46e23fa16ecdb13a995 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Sat, 19 Jun 2021 10:44:54 -0400 Subject: [PATCH] Remove spurious semicolons (should fix Chrome roll) Change-Id: Ib45c569e3bbfeb41003ca9c261408840fb0af9dc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/419897 Auto-Submit: Brian Osman Commit-Queue: Chris Dalton Reviewed-by: Chris Dalton --- src/gpu/GrAttachment.h | 2 +- src/gpu/GrCaps.h | 2 +- src/gpu/GrPipeline.h | 4 ++-- src/gpu/effects/GrPorterDuffXferProcessor.cpp | 2 +- src/gpu/glsl/GrGLSLFragmentShaderBuilder.h | 2 +- src/gpu/ops/GrDrawOp.h | 2 +- src/gpu/tessellate/GrTessellationPathRenderer.h | 4 ++-- src/gpu/tessellate/shaders/GrModulateAtlasCoverageFP.h | 2 +- src/gpu/tessellate/shaders/GrStrokeTessellationShader.h | 2 +- src/gpu/vk/GrVkRenderPass.h | 4 ++-- tools/gpu/GrContextFactory.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gpu/GrAttachment.h b/src/gpu/GrAttachment.h index d1b81e0eb1..03933a1d95 100644 --- a/src/gpu/GrAttachment.h +++ b/src/gpu/GrAttachment.h @@ -97,6 +97,6 @@ private: using INHERITED = GrSurface; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrAttachment::UsageFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrAttachment::UsageFlags) #endif diff --git a/src/gpu/GrCaps.h b/src/gpu/GrCaps.h index a5b3c05c4d..59a8970263 100644 --- a/src/gpu/GrCaps.h +++ b/src/gpu/GrCaps.h @@ -632,6 +632,6 @@ private: using INHERITED = SkRefCnt; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrCaps::ProgramDescOverrideFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrCaps::ProgramDescOverrideFlags) #endif diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index e43de9e292..66eba9a205 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -238,8 +238,8 @@ private: GrSwizzle fWriteSwizzle; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrPipeline::InputFlags); -GR_MAKE_BITFIELD_CLASS_OPS(GrPipeline::Flags); +GR_MAKE_BITFIELD_CLASS_OPS(GrPipeline::InputFlags) +GR_MAKE_BITFIELD_CLASS_OPS(GrPipeline::Flags) inline bool operator&(GrPipeline::Flags flags, GrPipeline::InputFlags inputFlag) { return (flags & (GrPipeline::Flags)inputFlag); diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 039b6bc63d..2ac202ada7 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -141,7 +141,7 @@ private: static_assert(4 == sizeof(BlendFormula)); -GR_MAKE_BITFIELD_OPS(BlendFormula::Properties); +GR_MAKE_BITFIELD_OPS(BlendFormula::Properties) constexpr BlendFormula::Properties BlendFormula::GetProperties(OutputType PrimaryOut, OutputType SecondaryOut, diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h index 9e68adb4dc..50fdeeb89c 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h @@ -64,7 +64,7 @@ private: char fPadding[4] = {}; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrGLSLFPFragmentBuilder::ScopeFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrGLSLFPFragmentBuilder::ScopeFlags) /* * This class is used by Xfer processors to build their fragment code. diff --git a/src/gpu/ops/GrDrawOp.h b/src/gpu/ops/GrDrawOp.h index ebcc9aea51..9bbc72ea1e 100644 --- a/src/gpu/ops/GrDrawOp.h +++ b/src/gpu/ops/GrDrawOp.h @@ -84,6 +84,6 @@ private: using INHERITED = GrOp; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrDrawOp::FixedFunctionFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrDrawOp::FixedFunctionFlags) #endif diff --git a/src/gpu/tessellate/GrTessellationPathRenderer.h b/src/gpu/tessellate/GrTessellationPathRenderer.h index 8ba1f9c201..4629085b75 100644 --- a/src/gpu/tessellate/GrTessellationPathRenderer.h +++ b/src/gpu/tessellate/GrTessellationPathRenderer.h @@ -90,7 +90,7 @@ private: SkTHashMap fAtlasPathCache; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrTessellationPathRenderer::PathFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrTessellationPathRenderer::PathFlags) #else // GR_OGA @@ -107,7 +107,7 @@ public: }; -GR_MAKE_BITFIELD_CLASS_OPS(GrTessellationPathRenderer::PathFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrTessellationPathRenderer::PathFlags) #endif // GR_OGA diff --git a/src/gpu/tessellate/shaders/GrModulateAtlasCoverageFP.h b/src/gpu/tessellate/shaders/GrModulateAtlasCoverageFP.h index 9ac146d178..c3ab717397 100644 --- a/src/gpu/tessellate/shaders/GrModulateAtlasCoverageFP.h +++ b/src/gpu/tessellate/shaders/GrModulateAtlasCoverageFP.h @@ -47,6 +47,6 @@ private: const SkIRect fBounds; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrModulateAtlasCoverageFP::Flags); +GR_MAKE_BITFIELD_CLASS_OPS(GrModulateAtlasCoverageFP::Flags) #endif diff --git a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h b/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h index ec58203f0f..88a8d39fc0 100644 --- a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h +++ b/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h @@ -213,7 +213,7 @@ private: class InstancedImpl; }; -GR_MAKE_BITFIELD_CLASS_OPS(GrStrokeTessellationShader::ShaderFlags); +GR_MAKE_BITFIELD_CLASS_OPS(GrStrokeTessellationShader::ShaderFlags) // This common base class emits shader code for our parametric/radial stroke tessellation algorithm // described above. The subclass emits its own specific setup code before calling into diff --git a/src/gpu/vk/GrVkRenderPass.h b/src/gpu/vk/GrVkRenderPass.h index 63d99e4a50..c6fbeeebbc 100644 --- a/src/gpu/vk/GrVkRenderPass.h +++ b/src/gpu/vk/GrVkRenderPass.h @@ -198,7 +198,7 @@ private: using INHERITED = GrVkManagedResource; }; -GR_MAKE_BITFIELD_OPS(GrVkRenderPass::AttachmentFlags); -GR_MAKE_BITFIELD_CLASS_OPS(GrVkRenderPass::SelfDependencyFlags); +GR_MAKE_BITFIELD_OPS(GrVkRenderPass::AttachmentFlags) +GR_MAKE_BITFIELD_CLASS_OPS(GrVkRenderPass::SelfDependencyFlags) #endif diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h index 5c9032ae88..272285deaf 100644 --- a/tools/gpu/GrContextFactory.h +++ b/tools/gpu/GrContextFactory.h @@ -204,6 +204,6 @@ private: } // namespace sk_gpu_test -GR_MAKE_BITFIELD_CLASS_OPS(sk_gpu_test::GrContextFactory::ContextOverrides); +GR_MAKE_BITFIELD_CLASS_OPS(sk_gpu_test::GrContextFactory::ContextOverrides) #endif