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

Commit d06db894 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "get rid of HAL pixelformats 5551 and 4444"

parents 7e897aa6 b251f3d0

cmds/screencap/screencap.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,6 @@ static SkBitmap::Config flinger2skia(PixelFormat f) 
    switch (f) {

    switch (f) {

        case PIXEL_FORMAT_RGB_565:

        case PIXEL_FORMAT_RGB_565:

            return SkBitmap::kRGB_565_Config;

            return SkBitmap::kRGB_565_Config;

        case PIXEL_FORMAT_RGBA_4444:

            return SkBitmap::kARGB_4444_Config;

        default:

        default:

            return SkBitmap::kARGB_8888_Config;

            return SkBitmap::kARGB_8888_Config;

    }

    }

core/jni/android_view_Surface.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,6 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) { 
    switch (format) {

    switch (format) {

    case PIXEL_FORMAT_RGBX_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBX_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_4444:    return SkBitmap::kARGB_4444_Config;

    case PIXEL_FORMAT_RGB_565:      return SkBitmap::kRGB_565_Config;

    case PIXEL_FORMAT_RGB_565:      return SkBitmap::kRGB_565_Config;

    default:                        return SkBitmap::kNo_Config;

    default:                        return SkBitmap::kNo_Config;

    }

    }

core/jni/android_view_SurfaceControl.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,6 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) { 
    switch (format) {

    switch (format) {

    case PIXEL_FORMAT_RGBX_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBX_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_8888:    return SkBitmap::kARGB_8888_Config;

    case PIXEL_FORMAT_RGBA_4444:    return SkBitmap::kARGB_4444_Config;

    case PIXEL_FORMAT_RGB_565:      return SkBitmap::kRGB_565_Config;

    case PIXEL_FORMAT_RGB_565:      return SkBitmap::kRGB_565_Config;

    default:                        return SkBitmap::kNo_Config;

    default:                        return SkBitmap::kNo_Config;

    }

    }