Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46049f5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents dd68cf76 df891f8a

libs/hwui/Caches.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+2 −1
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ sk_sp<Bitmap> SkiaOpenGLPipeline::allocateHardwareBitmap(renderthread::RenderThr 
        case kRGBA_8888_SkColorType:

            isSupported = true;

            // ARGB_4444 is upconverted to RGBA_8888

            [[fallthrough]];

        case kARGB_4444_SkColorType:

            pixelFormat = PIXEL_FORMAT_RGBA_8888;

            format = GL_RGBA;