Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-20 01:08:55 +00:00
committed by Gerrit Code Review
parent dd68cf76de df891f8a31
commit 46049f5fec
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/Caches.cpp
View File

@@ -234,13 +234,13 @@ void Caches::flush(FlushMode mode) {
gradientCache.clear(); gradientCache.clear();
fontRenderer.clear(); fontRenderer.clear();
fboCache.clear(); fboCache.clear();
// fall through [[fallthrough]];
case FlushMode::Moderate: case FlushMode::Moderate:
fontRenderer.flush(); fontRenderer.flush();
textureCache.flush(); textureCache.flush();
pathCache.clear(); pathCache.clear();
tessellationCache.clear(); tessellationCache.clear();
// fall through [[fallthrough]];
case FlushMode::Layers: case FlushMode::Layers:
renderBufferCache.clear(); renderBufferCache.clear();
break; break;

3
libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
View File

@@ -331,7 +331,8 @@ sk_sp<Bitmap> SkiaOpenGLPipeline::allocateHardwareBitmap(renderthread::RenderThr
switch (info.colorType()) { switch (info.colorType()) {
case kRGBA_8888_SkColorType: case kRGBA_8888_SkColorType:
isSupported = true; isSupported = true;
// ARGB_4444 is upconverted to RGBA_8888 // ARGB_4444 is upconverted to RGBA_8888
[[fallthrough]];
case kARGB_4444_SkColorType: case kARGB_4444_SkColorType:
pixelFormat = PIXEL_FORMAT_RGBA_8888; pixelFormat = PIXEL_FORMAT_RGBA_8888;
format = GL_RGBA; format = GL_RGBA;