diff options
| author | 2018-10-19 15:32:26 -0700 | |
|---|---|---|
| committer | 2018-10-19 15:32:26 -0700 | |
| commit | df891f8a31daafe488c00bb95a5afff14af83e43 (patch) | |
| tree | 4db312de182ff6aa233ea0746535e78392556555 | |
| parent | c4b647458c89468f1ad86b1700133a42b740d793 (diff) | |
Fix implicit-fallthrough warnings. DO NOT MERGE.
These changes are not needed in goog/master.
Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
| -rw-r--r-- | libs/hwui/Caches.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index 3c774a3313d2..0ffd116236f5 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -234,13 +234,13 @@ void Caches::flush(FlushMode mode) { gradientCache.clear(); fontRenderer.clear(); fboCache.clear(); - // fall through + [[fallthrough]]; case FlushMode::Moderate: fontRenderer.flush(); textureCache.flush(); pathCache.clear(); tessellationCache.clear(); - // fall through + [[fallthrough]]; case FlushMode::Layers: renderBufferCache.clear(); break; diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp index 270527d551a9..cb503593c6c8 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp @@ -331,7 +331,8 @@ sk_sp<Bitmap> SkiaOpenGLPipeline::allocateHardwareBitmap(renderthread::RenderThr switch (info.colorType()) { case kRGBA_8888_SkColorType: isSupported = true; - // ARGB_4444 is upconverted to RGBA_8888 + // ARGB_4444 is upconverted to RGBA_8888 + [[fallthrough]]; case kARGB_4444_SkColorType: pixelFormat = PIXEL_FORMAT_RGBA_8888; format = GL_RGBA; |