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

Commit 4e46959c authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Remove RGBX_FP16 format"

parents 045d4786 f7e79d6e

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -12733,7 +12733,6 @@ package android.graphics { 
    field public static final int RGBA_8888 = 1; // 0x1

    field public static final int RGBA_F16 = 22; // 0x16

    field public static final int RGBX_8888 = 2; // 0x2

    field public static final int RGBX_F16 = 23; // 0x17

    field public static final deprecated int RGB_332 = 11; // 0xb

    field public static final int RGB_565 = 4; // 0x4

    field public static final int RGB_888 = 3; // 0x3

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -13226,7 +13226,6 @@ package android.graphics { 
    field public static final int RGBA_8888 = 1; // 0x1

    field public static final int RGBA_F16 = 22; // 0x16

    field public static final int RGBX_8888 = 2; // 0x2

    field public static final int RGBX_F16 = 23; // 0x17

    field public static final deprecated int RGB_332 = 11; // 0xb

    field public static final int RGB_565 = 4; // 0x4

    field public static final int RGB_888 = 3; // 0x3

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -12764,7 +12764,6 @@ package android.graphics { 
    field public static final int RGBA_8888 = 1; // 0x1

    field public static final int RGBA_F16 = 22; // 0x16

    field public static final int RGBX_8888 = 2; // 0x2

    field public static final int RGBX_F16 = 23; // 0x17

    field public static final deprecated int RGB_332 = 11; // 0xb

    field public static final int RGB_565 = 4; // 0x4

    field public static final int RGB_888 = 3; // 0x3

core/jni/android_view_GraphicBuffer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -144,8 +144,6 @@ static inline SkColorType convertPixelFormat(int32_t format) { 
            return kN32_SkColorType;

        case PIXEL_FORMAT_RGBA_FP16:

            return kRGBA_F16_SkColorType;

        case PIXEL_FORMAT_RGBX_FP16:

            return kRGBA_F16_SkColorType;

        case PIXEL_FORMAT_RGB_565:

            return kRGB_565_SkColorType;

        default:

core/jni/android_view_Surface.cpp

+0 −2
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat( 
        case HAL_PIXEL_FORMAT_RGBA_8888:

        case HAL_PIXEL_FORMAT_RGBX_8888:

        case HAL_PIXEL_FORMAT_RGBA_FP16:

        case HAL_PIXEL_FORMAT_RGBX_FP16:

        case HAL_PIXEL_FORMAT_RGB_888:

        case HAL_PIXEL_FORMAT_RGB_565:

        case HAL_PIXEL_FORMAT_Y8:
@@ -285,7 +284,6 @@ static inline SkColorType convertPixelFormat(PixelFormat format) { 
    switch (format) {

    case PIXEL_FORMAT_RGBX_8888:    return kN32_SkColorType;

    case PIXEL_FORMAT_RGBA_8888:    return kN32_SkColorType;

    case PIXEL_FORMAT_RGBX_FP16:    return kRGBA_F16_SkColorType;

    case PIXEL_FORMAT_RGBA_FP16:    return kRGBA_F16_SkColorType;

    case PIXEL_FORMAT_RGB_565:      return kRGB_565_SkColorType;

    default:                        return kUnknown_SkColorType;