Fix occurrences of "-Wextra-semi-stmt"
Docs-Preview: https://skia.org/?cl=173761
Change-Id: Iefdb91cd28eabb4b01b7b42a4f300b0b4caf05d9
Reviewed-on: https://skia-review.googlesource.com/c/173761
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index a92bd6a..ed549b7 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -199,7 +199,7 @@
case kPngError:
// There was an error. Stop processing data.
// FIXME: Do we need to discard png_ptr?
- return false;;
+ return false;
case kStopDecoding:
// We decoded all the lines we want.
return true;
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
index ae96e80..b51f28a 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -408,7 +408,7 @@
bounds = &storage;
}
}
- LOOP_TILER(drawBitmap(bitmap, matrix, dstOrNull, paint), bounds);
+ LOOP_TILER(drawBitmap(bitmap, matrix, dstOrNull, paint), bounds)
}
static inline bool CanApplyDstMatrixAsCTM(const SkMatrix& m, const SkPaint& paint) {
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 6938173..9ea0289 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -924,9 +924,7 @@
#endif // SK_SUPPORT_GPU
-void sk_register_blur_maskfilter_createproc() {
- SK_REGISTER_FLATTENABLE(SkBlurMaskFilterImpl)
-}
+void sk_register_blur_maskfilter_createproc() { SK_REGISTER_FLATTENABLE(SkBlurMaskFilterImpl); }
sk_sp<SkMaskFilter> SkMaskFilter::MakeBlur(SkBlurStyle style, SkScalar sigma, bool respectCTM) {
if (SkScalarIsFinite(sigma) && sigma > 0) {
diff --git a/src/core/SkBlurMask.cpp b/src/core/SkBlurMask.cpp
index 1ca0e5b..81b1dea 100644
--- a/src/core/SkBlurMask.cpp
+++ b/src/core/SkBlurMask.cpp
@@ -182,7 +182,7 @@
} break;
default:
SK_ABORT("Unhandled format.");
- };
+ }
} break;
case kOuter_SkBlurStyle: {
auto dstStart = &dst->fImage[border.x() + border.y() * dst->fRowBytes];
@@ -215,7 +215,7 @@
} break;
default:
SK_ABORT("Unhandled format.");
- };
+ }
} break;
case kInner_SkBlurStyle: {
// now we allocate the "real" dst, mirror the size of src
@@ -262,7 +262,7 @@
} break;
default:
SK_ABORT("Unhandled format.");
- };
+ }
} break;
}
@@ -651,7 +651,7 @@
dst->fRowBytes, srcWidth, srcHeight);
SkMask::FreeImage(dstPixels);
} break;
- };
+ }
autoFreeDstPixels.release();
}
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index bcf648e..efa75a9 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2407,7 +2407,7 @@
void SkCanvas::onDrawImageSet(const ImageSetEntry imageSet[], int count,
SkFilterQuality filterQuality, SkBlendMode mode) {
SkPaint paint;
- LOOPER_BEGIN(paint, nullptr);
+ LOOPER_BEGIN(paint, nullptr)
while (iter.next()) {
iter.fDevice->drawImageSet(imageSet, count, filterQuality, mode);
}
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 08ff0e4..2089c08 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -282,7 +282,7 @@
#include "SkModeColorFilter.h"
void SkColorFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkComposeColorFilter)
- SK_REGISTER_FLATTENABLE(SkModeColorFilter)
- SK_REGISTER_FLATTENABLE(SkSRGBGammaColorFilter)
+ SK_REGISTER_FLATTENABLE(SkComposeColorFilter);
+ SK_REGISTER_FLATTENABLE(SkModeColorFilter);
+ SK_REGISTER_FLATTENABLE(SkSRGBGammaColorFilter);
}
diff --git a/src/core/SkCoverageDelta.h b/src/core/SkCoverageDelta.h
index 9a7a41d..e2dc06c 100644
--- a/src/core/SkCoverageDelta.h
+++ b/src/core/SkCoverageDelta.h
@@ -222,7 +222,7 @@
T mod16 = coverage & 0xffff;
result = ((mod16 << 1) - mod17).abs() >> 8;
} else {
- result = coverage.abs() >> 8;;
+ result = coverage.abs() >> 8;
}
result = T::Min(result, t255);
result = T::Max(result, t0);
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 3900630..3122217 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -149,7 +149,7 @@
mask.fBounds.set(left, top, right, bottom);
SkASSERT(!mask.fBounds.isEmpty());
- mask.fImage = (uint8_t*)image;;
+ mask.fImage = (uint8_t*)image;
mask.fRowBytes = glyph.rowBytes();
mask.fFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index f374af9..07e00a8 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -707,9 +707,9 @@
}
void SkMaskFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkMatrixMF)
- SK_REGISTER_FLATTENABLE(SkComposeMF)
- SK_REGISTER_FLATTENABLE(SkCombineMF)
+ SK_REGISTER_FLATTENABLE(SkMatrixMF);
+ SK_REGISTER_FLATTENABLE(SkComposeMF);
+ SK_REGISTER_FLATTENABLE(SkCombineMF);
sk_register_blur_maskfilter_createproc();
#if SK_SUPPORT_GPU
gr_register_sdf_maskfilter_createproc();
diff --git a/src/core/SkNormalSource.cpp b/src/core/SkNormalSource.cpp
index 71c7fb3..0ef26cb 100644
--- a/src/core/SkNormalSource.cpp
+++ b/src/core/SkNormalSource.cpp
@@ -13,7 +13,7 @@
SkNormalSource::~SkNormalSource() {}
void SkNormalSource::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkNormalMapSourceImpl)
- SK_REGISTER_FLATTENABLE(SkNormalFlatSourceImpl)
+ SK_REGISTER_FLATTENABLE(SkNormalMapSourceImpl);
+ SK_REGISTER_FLATTENABLE(SkNormalFlatSourceImpl);
}
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp
index a9b4eff..9ba3054 100644
--- a/src/core/SkPathEffect.cpp
+++ b/src/core/SkPathEffect.cpp
@@ -190,6 +190,6 @@
}
void SkPathEffect::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkComposePathEffect)
- SK_REGISTER_FLATTENABLE(SkSumPathEffect)
+ SK_REGISTER_FLATTENABLE(SkComposePathEffect);
+ SK_REGISTER_FLATTENABLE(SkSumPathEffect);
}
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 8d5e3ed..260ea90 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -142,7 +142,7 @@
uint32_t size,
SkCanvas* canvas,
const SkMatrix& initialMatrix) {
-#define BREAK_ON_READ_ERROR(r) if (!r->isValid()) { break; }
+#define BREAK_ON_READ_ERROR(r) if (!r->isValid()) break
switch (op) {
case NOOP: {
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index 1ae309b..85eeb5b 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -23,9 +23,9 @@
// These macros help with packing and unpacking a single byte value and
// a 3 byte value into/out of a uint32_t
#define MASK_24 0x00FFFFFF
-#define UNPACK_8_24(combined, small, large) \
- small = (combined >> 24) & 0xFF; \
- large = combined & MASK_24;
+#define UNPACK_8_24(combined, small, large) \
+ small = (combined >> 24) & 0xFF; \
+ large = combined & MASK_24
#define PACK_8_24(small, large) ((small << 24) | large)
diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index 45ac77f..a6f7bdc 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -78,8 +78,8 @@
new (fRecord->append<T>()) T{std::forward<Args>(args)...};
}
-#define TRY_MINIRECORDER(method, ...) \
- if (fMiniRecorder && fMiniRecorder->method(__VA_ARGS__)) { return; }
+#define TRY_MINIRECORDER(method, ...) \
+ if (fMiniRecorder && fMiniRecorder->method(__VA_ARGS__)) return
// For methods which must call back into SkNoDrawCanvas.
#define INHERITED(method, ...) this->SkNoDrawCanvas::method(__VA_ARGS__)
diff --git a/src/core/SkTraceEvent.h b/src/core/SkTraceEvent.h
index 5f9ae3c..219be42 100644
--- a/src/core/SkTraceEvent.h
+++ b/src/core/SkTraceEvent.h
@@ -151,15 +151,17 @@
#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name, ...) \
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \
skia::tracing_internals::ScopedTracer INTERNAL_TRACE_EVENT_UID(tracer); \
- if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
- SkEventTracer::Handle h = skia::tracing_internals::AddTraceEvent( \
- TRACE_EVENT_PHASE_COMPLETE, \
- INTERNAL_TRACE_EVENT_UID(category_group_enabled), \
- name, skia::tracing_internals::kNoEventId, \
- TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
- INTERNAL_TRACE_EVENT_UID(tracer).Initialize( \
- INTERNAL_TRACE_EVENT_UID(category_group_enabled), name, h); \
- }
+ do { \
+ if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
+ SkEventTracer::Handle h = skia::tracing_internals::AddTraceEvent( \
+ TRACE_EVENT_PHASE_COMPLETE, \
+ INTERNAL_TRACE_EVENT_UID(category_group_enabled), \
+ name, skia::tracing_internals::kNoEventId, \
+ TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
+ INTERNAL_TRACE_EVENT_UID(tracer).Initialize( \
+ INTERNAL_TRACE_EVENT_UID(category_group_enabled), name, h); \
+ } \
+ } while (0)
namespace skia {
namespace tracing_internals {
diff --git a/src/effects/SkHighContrastFilter.cpp b/src/effects/SkHighContrastFilter.cpp
index 2e057fa..9b0d105 100644
--- a/src/effects/SkHighContrastFilter.cpp
+++ b/src/effects/SkHighContrastFilter.cpp
@@ -151,7 +151,7 @@
}
void SkHighContrastFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkHighContrast_Filter)
+ SK_REGISTER_FLATTENABLE(SkHighContrast_Filter);
}
#if SK_SUPPORT_GPU
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 3f06c65..6eead48 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -82,7 +82,7 @@
}
void SkOverdrawColorFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkOverdrawColorFilter)
+ SK_REGISTER_FLATTENABLE(SkOverdrawColorFilter);
}
#if SK_SUPPORT_GPU
diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp
index f294d35..400bb81 100644
--- a/src/effects/SkShaderMaskFilter.cpp
+++ b/src/effects/SkShaderMaskFilter.cpp
@@ -128,6 +128,4 @@
return shader ? sk_sp<SkMaskFilter>(new SkShaderMF(std::move(shader))) : nullptr;
}
-void SkShaderMaskFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkShaderMF)
-}
+void SkShaderMaskFilter::RegisterFlattenables() { SK_REGISTER_FLATTENABLE(SkShaderMF); }
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index a97c9bf..2aa71f9 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -473,6 +473,4 @@
return sk_make_sp<SkTable_ColorFilter>(tableA, tableR, tableG, tableB);
}
-void SkTableColorFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkTable_ColorFilter)
-}
+void SkTableColorFilter::RegisterFlattenables() { SK_REGISTER_FLATTENABLE(SkTable_ColorFilter); }
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index 29d5cc5..02d0c0a 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -57,7 +57,7 @@
};
void SkAlphaThresholdFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkAlphaThresholdFilterImpl)
+ SK_REGISTER_FLATTENABLE(SkAlphaThresholdFilterImpl);
}
static SkScalar pin_0_1(SkScalar x) {
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 88a7c80..da81a8f 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -476,5 +476,5 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
void SkArithmeticImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(ArithmeticImageFilterImpl)
+ SK_REGISTER_FLATTENABLE(ArithmeticImageFilterImpl);
}
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 1037bdf..019bbe5 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -66,9 +66,7 @@
SkBlurImageFilter::TileMode fTileMode;
};
-void SkImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkBlurImageFilterImpl)
-}
+void SkImageFilter::RegisterFlattenables() { SK_REGISTER_FLATTENABLE(SkBlurImageFilterImpl); }
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
index 0427cff..cf95950 100644
--- a/src/effects/imagefilters/SkDisplacementMapEffect.cpp
+++ b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
@@ -33,7 +33,7 @@
namespace {
-#define kChannelSelectorKeyBits 3; // Max value is 4, so 3 bits are required at most
+#define kChannelSelectorKeyBits 3 // Max value is 4, so 3 bits are required at most
// Shift values to extract channels from an SkColor (SkColorGetR, SkColorGetG, etc)
const uint8_t gChannelTypeToShift[] = {
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index d89233f..92225a3 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -2193,6 +2193,6 @@
#endif
void SkLightingImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkDiffuseLightingImageFilter)
- SK_REGISTER_FLATTENABLE(SkSpecularLightingImageFilter)
+ SK_REGISTER_FLATTENABLE(SkDiffuseLightingImageFilter);
+ SK_REGISTER_FLATTENABLE(SkSpecularLightingImageFilter);
}
diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index a56817f..5225e06 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -350,5 +350,5 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
void SkXfermodeImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkXfermodeImageFilter_Base)
+ SK_REGISTER_FLATTENABLE(SkXfermodeImageFilter_Base);
}
diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index efea0fc..e822825 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -475,7 +475,7 @@
}
const DPoint& xFormPtLeft = segment.fXformMatrix.mapPoint(pointLeft);
- const DPoint& xFormPtRight = segment.fXformMatrix.mapPoint(pointRight);;
+ const DPoint& xFormPtRight = segment.fXformMatrix.mapPoint(pointRight);
rowData->fQuadXDirection = (int)sign_of(segment.fP2T.x() - segment.fP0T.x());
rowData->fScanlineXDirection = (int)sign_of(xFormPtRight.x() - xFormPtLeft.x());
@@ -742,11 +742,14 @@
int width, int height, size_t rowBytes) {
SkASSERT(distanceField);
- SkDEBUGCODE(SkPath xformPath;);
- SkDEBUGCODE(path.transform(drawMatrix, &xformPath));
- SkDEBUGCODE(SkIRect pathBounds = xformPath.getBounds().roundOut());
- SkDEBUGCODE(SkIRect expectPathBounds = SkIRect::MakeWH(width - 2 * SK_DistanceFieldPad,
- height - 2 * SK_DistanceFieldPad));
+#ifdef SK_DEBUG
+ SkPath xformPath;
+ path.transform(drawMatrix, &xformPath);
+ SkIRect pathBounds = xformPath.getBounds().roundOut();
+ SkIRect expectPathBounds =
+ SkIRect::MakeWH(width - 2 * SK_DistanceFieldPad, height - 2 * SK_DistanceFieldPad);
+#endif
+
SkASSERT(expectPathBounds.isEmpty() ||
expectPathBounds.contains(pathBounds.x(), pathBounds.y()));
SkASSERT(expectPathBounds.isEmpty() || pathBounds.isEmpty() ||
@@ -813,7 +816,7 @@
case SkPath::kCubic_Verb: {
add_cubic_segments(pts, &segments);
break;
- };
+ }
default:
break;
}
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index 6a8ded7..41cb6fa 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -15,8 +15,8 @@
/**
* Context level GrTracing macros, classname and op are const char*, context is GrContext
*/
-#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context) \
- GR_AUDIT_TRAIL_AUTO_FRAME(context->contextPriv().getAuditTrail(), classname "::" op); \
- TRACE_EVENT0("skia.gpu", classname "::" op);
+#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context) \
+ GR_AUDIT_TRAIL_AUTO_FRAME(context->contextPriv().getAuditTrail(), classname "::" op); \
+ TRACE_EVENT0("skia.gpu", classname "::" op)
#endif
diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp
index e40dfd5..e962165 100644
--- a/src/gpu/GrXferProcessor.cpp
+++ b/src/gpu/GrXferProcessor.cpp
@@ -102,7 +102,7 @@
case kIllegal_GrBlendEquation:
SkASSERT(false);
return "<illegal>";
- };
+ }
return "";
}
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index fc26089..de239fc 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -1735,13 +1735,13 @@
// Leaving Gray8 as non-renderable, to keep things simple and match raster. However, we do
// enable the FBOColorAttachment_Flag so that we can bind it to an FBO for copies.
- grayRedInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;;
+ grayRedInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;
if (kStandard_MSFBOType == this->msFBOType() && kGL_GrGLStandard == standard &&
!disableGrayLumFBOForMesa) {
// desktop ARB extension/3.0+ supports LUMINANCE8 as renderable.
// However, osmesa fails if it used even when GL_ARB_framebuffer_object is present.
// Core profile removes LUMINANCE8 support, but we should have chosen R8 in that case.
- grayLumInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;;
+ grayLumInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;
}
if (texStorageSupported && !isCommandBufferES2) {
if (!disableR8TexStorageForANGLEGL) {
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 68094f9..fb74efb 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -207,7 +207,7 @@
case GrSamplerState::WrapMode::kClamp: return GR_GL_CLAMP_TO_EDGE;
case GrSamplerState::WrapMode::kRepeat: return GR_GL_REPEAT;
case GrSamplerState::WrapMode::kMirrorRepeat: return GR_GL_MIRRORED_REPEAT;
- };
+ }
SK_ABORT("Unknown wrap mode");
return 0;
}
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index f63f483..f7157de 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -24,16 +24,16 @@
#define RETURN_FALSE_INTERFACE \
if (kIsDebug) { SkDebugf("%s:%d GrGLInterface::validate() failed.\n", __FILE__, __LINE__); } \
- return false;
+ return false
bool GrGLInterface::validate() const {
if (kNone_GrGLStandard == fStandard) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
if (!fExtensions.isInitialized()) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
// functions that are always required
@@ -139,12 +139,12 @@
!fFunctions.fGenFramebuffers ||
!fFunctions.fGenRenderbuffers ||
!fFunctions.fRenderbufferStorage) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
GrGLVersion glVer = GrGLGetVersion(this);
if (GR_GL_INVALID_VER == glVer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
// Now check that baseline ES/Desktop fns not covered above are present
@@ -156,7 +156,7 @@
// is present or GL version is high enough.
if (kGL_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3,0) && !fFunctions.fBindFragDataLocation) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
if (glVer >= GR_GL_VER(3,3) ||
@@ -164,12 +164,12 @@
fExtensions.has("GL_EXT_timer_query")) {
if (!fFunctions.fGetQueryObjecti64v ||
!fFunctions.fGetQueryObjectui64v) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_timer_query")) {
if (!fFunctions.fQueryCounter) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -178,26 +178,26 @@
if (kGL_GrGLStandard == fStandard &&
(!fFunctions.fDrawBuffer ||
!fFunctions.fPolygonMode)) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
// ES 3.0 (or ES 2.0 extended) has glDrawBuffers but not glDrawBuffer
if (kGL_GrGLStandard == fStandard || glVer >= GR_GL_VER(3,0)) {
if (!fFunctions.fDrawBuffers) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (kGL_GrGLStandard == fStandard || glVer >= GR_GL_VER(3,0)) {
if (!fFunctions.fReadBuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
// glGetTexLevelParameteriv was added to ES in 3.1.
if (kGL_GrGLStandard == fStandard || glVer >= GR_GL_VER(3,1)) {
if (!fFunctions.fGetTexLevelParameteriv) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -208,12 +208,12 @@
fExtensions.has("GL_ARB_texture_storage") ||
fExtensions.has("GL_EXT_texture_storage")) {
if (!fFunctions.fTexStorage2D) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_texture_storage")) {
if (!fFunctions.fTexStorage2D) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -223,25 +223,25 @@
fExtensions.has("GL_ARB_texture_barrier") ||
fExtensions.has("GL_NV_texture_barrier")) {
if (!fFunctions.fTextureBarrier) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else if (fExtensions.has("GL_NV_texture_barrier")) {
if (!fFunctions.fTextureBarrier) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_KHR_blend_equation_advanced") ||
fExtensions.has("GL_NV_blend_equation_advanced")) {
if (!fFunctions.fBlendBarrier) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_EXT_discard_framebuffer")) {
if (!fFunctions.fDiscardFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -255,13 +255,13 @@
!fFunctions.fEndQuery ||
!fFunctions.fGetQueryiv ||
!fFunctions.fGetQueryObjectuiv) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
#endif
}
// glGetQueryObjectiv doesn't exist in ES.
if (kGL_GrGLStandard == fStandard && !fFunctions.fGetQueryObjectiv) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
// FBO MSAA
@@ -270,45 +270,45 @@
if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_ARB_framebuffer_object")) {
if (!fFunctions.fRenderbufferStorageMultisample ||
!fFunctions.fBlitFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
} else {
if (fExtensions.has("GL_EXT_framebuffer_blit") &&
!fFunctions.fBlitFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
if (fExtensions.has("GL_EXT_framebuffer_multisample") &&
!fFunctions.fRenderbufferStorageMultisample) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else {
if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_CHROMIUM_framebuffer_multisample")) {
if (!fFunctions.fRenderbufferStorageMultisample ||
!fFunctions.fBlitFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
} else {
if (fExtensions.has("GL_ANGLE_framebuffer_multisample") &&
!fFunctions.fRenderbufferStorageMultisample) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
if (fExtensions.has("GL_ANGLE_framebuffer_blit") &&
!fFunctions.fBlitFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_APPLE_framebuffer_multisample")) {
if (!fFunctions.fRenderbufferStorageMultisampleES2APPLE ||
!fFunctions.fResolveMultisampleFramebuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_IMG_multisampled_render_to_texture") ||
fExtensions.has("GL_EXT_multisampled_render_to_texture")) {
if (!fFunctions.fRenderbufferStorageMultisampleES2EXT ||
!fFunctions.fFramebufferTexture2DMultisample) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -319,7 +319,7 @@
if (kGL_GrGLStandard == fStandard || fExtensions.has("GL_OES_mapbuffer")) {
if (!fFunctions.fMapBuffer ||
!fFunctions.fUnmapBuffer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -327,14 +327,14 @@
if (kGL_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_blend_func_extended")) {
if (!fFunctions.fBindFragDataLocationIndexed) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else {
if (glVer >= GR_GL_VER(3,0) && fExtensions.has("GL_EXT_blend_func_extended")) {
if (!fFunctions.fBindFragDataLocation ||
!fFunctions.fBindFragDataLocationIndexed) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -343,14 +343,14 @@
// glGetStringi was added in version 3.0 of both desktop and ES.
if (glVer >= GR_GL_VER(3, 0)) {
if (!fFunctions.fGetStringi) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
// glVertexAttribIPointer was added in version 3.0 of both desktop and ES.
if (glVer >= GR_GL_VER(3, 0)) {
if (!fFunctions.fVertexAttribIPointer) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -380,7 +380,7 @@
if (!fFunctions.fBindVertexArray ||
!fFunctions.fDeleteVertexArrays ||
!fFunctions.fGenVertexArrays) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else {
@@ -388,7 +388,7 @@
if (!fFunctions.fBindVertexArray ||
!fFunctions.fDeleteVertexArrays ||
!fFunctions.fGenVertexArrays) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -397,7 +397,7 @@
if (!fFunctions.fInsertEventMarker ||
!fFunctions.fPushGroupMarker ||
!fFunctions.fPopGroupMarker) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -442,7 +442,7 @@
(glVer >= GR_GL_VER(3,2) || fExtensions.has("GL_ARB_texture_multisample"))) ||
(kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1))) {
if (!fFunctions.fGetMultisamplefv) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -450,14 +450,14 @@
(glVer >= GR_GL_VER(4,3) || fExtensions.has("GL_ARB_program_interface_query"))) ||
(kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1))) {
if (!fFunctions.fGetProgramResourceLocation) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (kGLES_GrGLStandard == fStandard || glVer >= GR_GL_VER(4,1) ||
fExtensions.has("GL_ARB_ES2_compatibility")) {
if (!fFunctions.fGetShaderPrecisionFormat) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -491,25 +491,25 @@
!fFunctions.fProgramPathFragmentInputGen
#endif
) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
if (fExtensions.has("GL_CHROMIUM_path_rendering")) {
if (!fFunctions.fBindFragmentInputLocation) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
if (fExtensions.has("GL_EXT_raster_multisample")) {
if (!fFunctions.fRasterSamples) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_NV_framebuffer_mixed_samples") ||
fExtensions.has("GL_CHROMIUM_framebuffer_mixed_samples")) {
if (!fFunctions.fCoverageModulation) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -518,14 +518,14 @@
fExtensions.has("GL_EXT_draw_instanced") || fExtensions.has("GL_ARB_draw_instanced")) {
if (!fFunctions.fDrawArraysInstanced ||
!fFunctions.fDrawElementsInstanced) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else if (kGLES_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_draw_instanced")) {
if (!fFunctions.fDrawArraysInstanced ||
!fFunctions.fDrawElementsInstanced) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -533,13 +533,13 @@
if (kGL_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3,2) || fExtensions.has("GL_ARB_instanced_arrays")) {
if (!fFunctions.fVertexAttribDivisor) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else if (kGLES_GrGLStandard == fStandard) {
if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_instanced_arrays")) {
if (!fFunctions.fVertexAttribDivisor) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -549,7 +549,7 @@
(kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1))) {
if (!fFunctions.fDrawArraysIndirect ||
!fFunctions.fDrawElementsIndirect) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -558,7 +558,7 @@
(kGLES_GrGLStandard == fStandard && fExtensions.has("GL_EXT_multi_draw_indirect"))) {
if (!fFunctions.fMultiDrawArraysIndirect ||
!fFunctions.fMultiDrawElementsIndirect) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -571,24 +571,24 @@
!fFunctions.fPushDebugGroup ||
!fFunctions.fPopDebugGroup ||
!fFunctions.fObjectLabel) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if (fExtensions.has("GL_EXT_window_rectangles")) {
if (!fFunctions.fWindowRectangles) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,0)) ||
fExtensions.has("GL_ARB_sample_shading")) {
if (!fFunctions.fMinSampleShading) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
} else if (kGLES_GrGLStandard == fStandard && fExtensions.has("GL_OES_sample_shading")) {
if (!fFunctions.fMinSampleShading) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
@@ -599,7 +599,7 @@
!fFunctions.fClientWaitSync ||
!fFunctions.fWaitSync ||
!fFunctions.fDeleteSync) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
} else if (kGLES_GrGLStandard == fStandard) {
@@ -609,7 +609,7 @@
!fFunctions.fClientWaitSync ||
!fFunctions.fWaitSync ||
!fFunctions.fDeleteSync) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
}
@@ -617,7 +617,7 @@
if (fExtensions.has("EGL_KHR_image") || fExtensions.has("EGL_KHR_image_base")) {
if (!fFunctions.fEGLCreateImage ||
!fFunctions.fEGLDestroyImage) {
- RETURN_FALSE_INTERFACE
+ RETURN_FALSE_INTERFACE;
}
}
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp
index 1b3cfbd..7943b38 100644
--- a/src/gpu/gl/GrGLPathRendering.cpp
+++ b/src/gpu/gl/GrGLPathRendering.cpp
@@ -42,7 +42,7 @@
switch (op) {
default:
SK_ABORT("Unexpected path fill.");
- /* fallthrough */;
+ /* fallthrough */
case GrStencilOp::kIncWrap:
return GR_GL_COUNT_UP;
case GrStencilOp::kInvert:
@@ -66,7 +66,7 @@
void GrGLPathRendering::disconnect(GrGpu::DisconnectType type) {
if (GrGpu::DisconnectType::kCleanup == type) {
this->deletePaths(fFirstPreallocatedPathID, fPreallocatedPathCount);
- };
+ }
fPreallocatedPathCount = 0;
}
diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/gl/GrGLProgramDataManager.cpp
index 0f92d59..9c332bf 100644
--- a/src/gpu/gl/GrGLProgramDataManager.cpp
+++ b/src/gpu/gl/GrGLProgramDataManager.cpp
@@ -29,7 +29,7 @@
SkDEBUGCODE(
uniform.fArrayCount = builderUniform.fVariable.getArrayCount();
uniform.fType = builderUniform.fVariable.getType();
- );
+ )
uniform.fLocation = builderUniform.fLocation;
}
@@ -45,7 +45,7 @@
SkDEBUGCODE(
pathProcVarying.fArrayCount = builderPathProcVarying.fVariable.getArrayCount();
pathProcVarying.fType = builderPathProcVarying.fVariable.getType();
- );
+ )
pathProcVarying.fLocation = builderPathProcVarying.fLocation;
}
}
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 99ef6b1..1deb8be 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -327,7 +327,7 @@
update_degenerate_test(°enerateData, pts[3]);
add_cubic_segments(pts, dir, segments);
break;
- };
+ }
case SkPath::kDone_Verb:
if (degenerateData.isDegenerate()) {
return false;
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 30ab521..195f4b3 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -183,7 +183,7 @@
*hasColorAttribute = true;
} else {
*hasColorAttribute = false;
- };
+ }
const SkMatrix& vm = this->hasMultipleViewMatrices() ? SkMatrix::I() : fMeshes[0].fViewMatrix;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index ace2514..c392364 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -2558,7 +2558,7 @@
default:
SkASSERT(false);
return nullptr;
- };
+ }
}
class EllipticalRRectOp : public GrMeshDrawOp {
diff --git a/src/gpu/text/GrSDFMaskFilter.cpp b/src/gpu/text/GrSDFMaskFilter.cpp
index f558c07..2cac913 100644
--- a/src/gpu/text/GrSDFMaskFilter.cpp
+++ b/src/gpu/text/GrSDFMaskFilter.cpp
@@ -91,9 +91,7 @@
return GrSDFMaskFilter::Make();
}
-void gr_register_sdf_maskfilter_createproc() {
- SK_REGISTER_FLATTENABLE(GrSDFMaskFilterImpl)
-}
+void gr_register_sdf_maskfilter_createproc() { SK_REGISTER_FLATTENABLE(GrSDFMaskFilterImpl); }
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp b/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
index 6327296..ebecbad 100644
--- a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
+++ b/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
@@ -17,7 +17,7 @@
: fAllocator(VK_NULL_HANDLE)
, fInterface(std::move(interface))
, fDevice(device) {
-#define GR_COPY_FUNCTION(NAME) functions.vk##NAME = fInterface->fFunctions.f##NAME;
+#define GR_COPY_FUNCTION(NAME) functions.vk##NAME = fInterface->fFunctions.f##NAME
VmaVulkanFunctions functions;
GR_COPY_FUNCTION(GetPhysicalDeviceProperties);
diff --git a/src/gpu/vk/GrVkImage.cpp b/src/gpu/vk/GrVkImage.cpp
index 344c35d..67c19d0 100644
--- a/src/gpu/vk/GrVkImage.cpp
+++ b/src/gpu/vk/GrVkImage.cpp
@@ -42,7 +42,7 @@
// and the image is linear.
// TODO: Add check for linear here so we are not always adding host to general, and we should
// only be in preinitialized if we are linear
- VkAccessFlags flags = 0;;
+ VkAccessFlags flags = 0;
if (VK_IMAGE_LAYOUT_GENERAL == layout) {
flags = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT |
diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/vk/GrVkInterface.cpp
index 1477ce8..96cb457 100644
--- a/src/gpu/vk/GrVkInterface.cpp
+++ b/src/gpu/vk/GrVkInterface.cpp
@@ -10,11 +10,12 @@
#include "vk/GrVkExtensions.h"
#include "vk/GrVkUtil.h"
-#define ACQUIRE_PROC(name, instance, device) fFunctions.f##name = \
- reinterpret_cast<PFN_vk##name>(getProc("vk"#name, instance, device));
+#define ACQUIRE_PROC(name, instance, device) \
+ fFunctions.f##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device))
-#define ACQUIRE_PROC_SUFFIX(name, suffix, instance, device) fFunctions.f##name = \
- reinterpret_cast<PFN_vk##name##suffix>(getProc("vk"#name#suffix, instance, device));
+#define ACQUIRE_PROC_SUFFIX(name, suffix, instance, device) \
+ fFunctions.f##name = \
+ reinterpret_cast<PFN_vk##name##suffix>(getProc("vk" #name #suffix, instance, device))
GrVkInterface::GrVkInterface(GrVkGetProc getProc,
VkInstance instance,
diff --git a/src/gpu/vk/GrVkPipelineStateDataManager.cpp b/src/gpu/vk/GrVkPipelineStateDataManager.cpp
index 71f2c98..6a47cb5 100644
--- a/src/gpu/vk/GrVkPipelineStateDataManager.cpp
+++ b/src/gpu/vk/GrVkPipelineStateDataManager.cpp
@@ -31,7 +31,7 @@
SkDEBUGCODE(
uniform.fArrayCount = uniformInfo.fVariable.getArrayCount();
uniform.fType = uniformInfo.fVariable.getType();
- );
+ )
if (!(kFragment_GrShaderFlag & uniformInfo.fVisibility)) {
uniform.fBinding = GrVkUniformHandler::kGeometryBinding;
diff --git a/src/gpu/vk/GrVkUtil.h b/src/gpu/vk/GrVkUtil.h
index 32aac7f..34802fe 100644
--- a/src/gpu/vk/GrVkUtil.h
+++ b/src/gpu/vk/GrVkUtil.h
@@ -19,14 +19,14 @@
class GrVkGpu;
// makes a Vk call on the interface
-#define GR_VK_CALL(IFACE, X) (IFACE)->fFunctions.f##X;
+#define GR_VK_CALL(IFACE, X) (IFACE)->fFunctions.f##X
// same as GR_VK_CALL but checks for success
#ifdef SK_DEBUG
-#define GR_VK_CALL_ERRCHECK(IFACE, X) \
+#define GR_VK_CALL_ERRCHECK(IFACE, X) \
VkResult SK_MACRO_APPEND_LINE(ret) = GR_VK_CALL(IFACE, X); \
- SkASSERT(VK_SUCCESS == SK_MACRO_APPEND_LINE(ret));
+ SkASSERT(VK_SUCCESS == SK_MACRO_APPEND_LINE(ret))
#else
-#define GR_VK_CALL_ERRCHECK(IFACE, X) (void) GR_VK_CALL(IFACE, X);
+#define GR_VK_CALL_ERRCHECK(IFACE, X) (void) GR_VK_CALL(IFACE, X)
#endif
/**
diff --git a/src/pathops/SkOpSpan.cpp b/src/pathops/SkOpSpan.cpp
index a68133e..3dc9c0e 100644
--- a/src/pathops/SkOpSpan.cpp
+++ b/src/pathops/SkOpSpan.cpp
@@ -374,7 +374,6 @@
SkOpContour* contourHead = globals->contourHead();
int windTry = 0;
while (!this->sortableTop(contourHead) && ++windTry < SkOpGlobalState::kMaxWindingTries) {
- ;
}
return this->windSum();
}
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index c9e0b53..4d9a71f 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -504,7 +504,7 @@
SkPDFSharedStream::~SkPDFSharedStream() { this->drop(); }
void SkPDFSharedStream::drop() {
- fAsset = nullptr;;
+ fAsset = nullptr;
fDict.drop();
}
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 61903bc..75710b0 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -124,12 +124,10 @@
#define SK_FONTMGR_ANDROID_PARSER_PREFIX "[SkFontMgr Android Parser] "
-#define SK_FONTCONFIGPARSER_WARNING(message, ...) SkDebugf( \
- SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d: warning: " message "\n", \
- self->fFilename, \
- XML_GetCurrentLineNumber(self->fParser), \
- XML_GetCurrentColumnNumber(self->fParser), \
- ##__VA_ARGS__);
+#define SK_FONTCONFIGPARSER_WARNING(message, ...) \
+ SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d: warning: " message "\n", self->fFilename, \
+ XML_GetCurrentLineNumber(self->fParser), XML_GetCurrentColumnNumber(self->fParser), \
+ ##__VA_ARGS__)
static bool is_whitespace(char c) {
return c == ' ' || c == '\n'|| c == '\r' || c == '\t';
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 601148a..7241468 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -76,48 +76,48 @@
*/
void SkFlattenable::PrivateInitializer::InitEffects() {
// Shaders.
- SK_REGISTER_FLATTENABLE(SkColor4Shader)
- SK_REGISTER_FLATTENABLE(SkColorFilterShader)
- SK_REGISTER_FLATTENABLE(SkColorShader)
- SK_REGISTER_FLATTENABLE(SkComposeShader)
- SK_REGISTER_FLATTENABLE(SkEmptyShader)
- SK_REGISTER_FLATTENABLE(SkLocalMatrixShader)
- SK_REGISTER_FLATTENABLE(SkPictureShader)
+ SK_REGISTER_FLATTENABLE(SkColor4Shader);
+ SK_REGISTER_FLATTENABLE(SkColorFilterShader);
+ SK_REGISTER_FLATTENABLE(SkColorShader);
+ SK_REGISTER_FLATTENABLE(SkComposeShader);
+ SK_REGISTER_FLATTENABLE(SkEmptyShader);
+ SK_REGISTER_FLATTENABLE(SkLocalMatrixShader);
+ SK_REGISTER_FLATTENABLE(SkPictureShader);
SkGradientShader::RegisterFlattenables();
SkLightingShader::RegisterFlattenables();
SkPerlinNoiseShader::RegisterFlattenables();
SkShaderBase::RegisterFlattenables();
// Color filters.
- SK_REGISTER_FLATTENABLE(SkColorMatrixFilterRowMajor255)
- SK_REGISTER_FLATTENABLE(SkLumaColorFilter)
- SK_REGISTER_FLATTENABLE(SkToSRGBColorFilter)
+ SK_REGISTER_FLATTENABLE(SkColorMatrixFilterRowMajor255);
+ SK_REGISTER_FLATTENABLE(SkLumaColorFilter);
+ SK_REGISTER_FLATTENABLE(SkToSRGBColorFilter);
SkColorFilter::RegisterFlattenables();
SkHighContrastFilter::RegisterFlattenables();
SkOverdrawColorFilter::RegisterFlattenables();
SkTableColorFilter::RegisterFlattenables();
// Mask filters.
- SK_REGISTER_FLATTENABLE(SkEmbossMaskFilter)
+ SK_REGISTER_FLATTENABLE(SkEmbossMaskFilter);
SkMaskFilter::RegisterFlattenables();
SkShaderMaskFilter::RegisterFlattenables();
// Path effects.
- SK_REGISTER_FLATTENABLE(SkCornerPathEffect)
- SK_REGISTER_FLATTENABLE(SkDashImpl)
- SK_REGISTER_FLATTENABLE(SkDiscretePathEffect)
- SK_REGISTER_FLATTENABLE(SkLine2DPathEffect)
- SK_REGISTER_FLATTENABLE(SkMatrixPE)
- SK_REGISTER_FLATTENABLE(SkOpPE)
- SK_REGISTER_FLATTENABLE(SkPath1DPathEffect)
- SK_REGISTER_FLATTENABLE(SkPath2DPathEffect)
- SK_REGISTER_FLATTENABLE(SkStrokePE)
- SK_REGISTER_FLATTENABLE(SkTrimPE)
+ SK_REGISTER_FLATTENABLE(SkCornerPathEffect);
+ SK_REGISTER_FLATTENABLE(SkDashImpl);
+ SK_REGISTER_FLATTENABLE(SkDiscretePathEffect);
+ SK_REGISTER_FLATTENABLE(SkLine2DPathEffect);
+ SK_REGISTER_FLATTENABLE(SkMatrixPE);
+ SK_REGISTER_FLATTENABLE(SkOpPE);
+ SK_REGISTER_FLATTENABLE(SkPath1DPathEffect);
+ SK_REGISTER_FLATTENABLE(SkPath2DPathEffect);
+ SK_REGISTER_FLATTENABLE(SkStrokePE);
+ SK_REGISTER_FLATTENABLE(SkTrimPE);
SkPathEffect::RegisterFlattenables();
// Misc.
- SK_REGISTER_FLATTENABLE(SkLayerDrawLooper)
- SK_REGISTER_FLATTENABLE(SkRecordedDrawable)
+ SK_REGISTER_FLATTENABLE(SkLayerDrawLooper);
+ SK_REGISTER_FLATTENABLE(SkRecordedDrawable);
SkNormalSource::RegisterFlattenables();
}
@@ -133,22 +133,22 @@
SkImageFilter::RegisterFlattenables();
SkArithmeticImageFilter::RegisterFlattenables();
SkXfermodeImageFilter::RegisterFlattenables();
- SK_REGISTER_FLATTENABLE(SkDilateImageFilter)
- SK_REGISTER_FLATTENABLE(SkDisplacementMapEffect)
- SK_REGISTER_FLATTENABLE(SkDropShadowImageFilter)
- SK_REGISTER_FLATTENABLE(SkErodeImageFilter)
- SK_REGISTER_FLATTENABLE(SkImageSource)
- SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter)
- SK_REGISTER_FLATTENABLE(SkPaintImageFilter)
- SK_REGISTER_FLATTENABLE(SkPictureImageFilter)
- SK_REGISTER_FLATTENABLE(SkTileImageFilter)
- SK_REGISTER_FLATTENABLE(SkMagnifierImageFilter)
- SK_REGISTER_FLATTENABLE(SkMatrixConvolutionImageFilter)
- SK_REGISTER_FLATTENABLE(SkMatrixImageFilter)
- SK_REGISTER_FLATTENABLE(SkOffsetImageFilter)
- SK_REGISTER_FLATTENABLE(SkComposeImageFilter)
- SK_REGISTER_FLATTENABLE(SkMergeImageFilter)
- SK_REGISTER_FLATTENABLE(SkColorFilterImageFilter)
+ SK_REGISTER_FLATTENABLE(SkDilateImageFilter);
+ SK_REGISTER_FLATTENABLE(SkDisplacementMapEffect);
+ SK_REGISTER_FLATTENABLE(SkDropShadowImageFilter);
+ SK_REGISTER_FLATTENABLE(SkErodeImageFilter);
+ SK_REGISTER_FLATTENABLE(SkImageSource);
+ SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter);
+ SK_REGISTER_FLATTENABLE(SkPaintImageFilter);
+ SK_REGISTER_FLATTENABLE(SkPictureImageFilter);
+ SK_REGISTER_FLATTENABLE(SkTileImageFilter);
+ SK_REGISTER_FLATTENABLE(SkMagnifierImageFilter);
+ SK_REGISTER_FLATTENABLE(SkMatrixConvolutionImageFilter);
+ SK_REGISTER_FLATTENABLE(SkMatrixImageFilter);
+ SK_REGISTER_FLATTENABLE(SkOffsetImageFilter);
+ SK_REGISTER_FLATTENABLE(SkComposeImageFilter);
+ SK_REGISTER_FLATTENABLE(SkMergeImageFilter);
+ SK_REGISTER_FLATTENABLE(SkColorFilterImageFilter);
SkLightingImageFilter::RegisterFlattenables();
}
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index e062f3d..049dcd9 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -237,9 +237,7 @@
tmx, tmy, localMatrix);
}
-void SkShaderBase::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkImageShader)
-}
+void SkShaderBase::RegisterFlattenables() { SK_REGISTER_FLATTENABLE(SkImageShader); }
bool SkImageShader::onAppendStages(const StageRec& rec) const {
SkRasterPipeline* p = rec.fPipeline;
diff --git a/src/shaders/SkLightingShader.cpp b/src/shaders/SkLightingShader.cpp
index d6ddb20..95c20e8 100644
--- a/src/shaders/SkLightingShader.cpp
+++ b/src/shaders/SkLightingShader.cpp
@@ -496,6 +496,4 @@
///////////////////////////////////////////////////////////////////////////////
-void SkLightingShader::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkLightingShaderImpl)
-}
+void SkLightingShader::RegisterFlattenables() { SK_REGISTER_FLATTENABLE(SkLightingShaderImpl); }
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 6143669..b0e3b58 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -1538,5 +1538,5 @@
}
void SkPerlinNoiseShader::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkPerlinNoiseShaderImpl)
+ SK_REGISTER_FLATTENABLE(SkPerlinNoiseShaderImpl);
}
diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index 2a9bfdd..c1d5f0c 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -897,8 +897,8 @@
}
void SkGradientShader::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkLinearGradient)
- SK_REGISTER_FLATTENABLE(SkRadialGradient)
- SK_REGISTER_FLATTENABLE(SkSweepGradient)
- SK_REGISTER_FLATTENABLE(SkTwoPointConicalGradient)
+ SK_REGISTER_FLATTENABLE(SkLinearGradient);
+ SK_REGISTER_FLATTENABLE(SkRadialGradient);
+ SK_REGISTER_FLATTENABLE(SkSweepGradient);
+ SK_REGISTER_FLATTENABLE(SkTwoPointConicalGradient);
}
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index bf9e5e1..3374630 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -123,8 +123,8 @@
static void fill_caps(const SKSL_CAPS_CLASS& caps,
std::unordered_map<String, Program::Settings::Value>* capsMap) {
-#define CAP(name) capsMap->insert(std::make_pair(String(#name), \
- Program::Settings::Value(caps.name())));
+#define CAP(name) \
+ capsMap->insert(std::make_pair(String(#name), Program::Settings::Value(caps.name())))
CAP(fbFetchSupport);
CAP(fbFetchNeedsCustomOutput);
CAP(dropsTileOnZeroDivide);
@@ -1180,9 +1180,9 @@
right.componentType(), outLeftType, outRightType,
outResultType, false)) {
*outLeftType = &(*outResultType)->toCompound(context, left.columns(),
- left.rows());;
+ left.rows());
*outRightType = &(*outResultType)->toCompound(context, right.columns(),
- right.rows());;
+ right.rows());
int leftColumns = left.columns();
int leftRows = left.rows();
int rightColumns;
@@ -1413,7 +1413,7 @@
args.emplace_back(new FloatLiteral(fContext, -1, value)); \
} \
return std::unique_ptr<Expression>(new Constructor(-1, left.fType, \
- std::move(args)));
+ std::move(args)))
switch (op) {
case Token::EQEQ:
return std::unique_ptr<Expression>(new BoolLiteral(fContext, -1,
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index c9a8adb..ae703c2 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -81,7 +81,7 @@
void Parser::InitLayoutMap() {
layoutTokens = new std::unordered_map<String, LayoutToken>;
- #define TOKEN(name, text) (*layoutTokens)[text] = LayoutToken::name;
+ #define TOKEN(name, text) (*layoutTokens)[text] = LayoutToken::name
TOKEN(LOCATION, "location");
TOKEN(OFFSET, "offset");
TOKEN(BINDING, "binding");
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 8c2d916..2878296 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2352,7 +2352,7 @@
this->writeInstruction(SpvOpSNegate, typeId, result, expr, out);
} else {
ABORT("unsupported prefix expression %s", p.description().c_str());
- };
+ }
return result;
}
switch (p.fOperator) {
diff --git a/src/xml/SkXMLParser.cpp b/src/xml/SkXMLParser.cpp
index 36e1ab3..8e5b554 100644
--- a/src/xml/SkXMLParser.cpp
+++ b/src/xml/SkXMLParser.cpp
@@ -86,7 +86,7 @@
SkString fBufferedText;
};
-#define HANDLER_CONTEXT(arg, name) ParsingContext* name = static_cast<ParsingContext*>(arg);
+#define HANDLER_CONTEXT(arg, name) ParsingContext* name = static_cast<ParsingContext*>(arg)
void XMLCALL start_element_handler(void *data, const char* tag, const char** attributes) {
HANDLER_CONTEXT(data, ctx);