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

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

Merge "Remove RGBX_FP16 format"

parents 8018f22c d3e08d48

include/android/native_window.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ enum { 
    WINDOW_FORMAT_RGB_565            = 4,

    /** Red: 16 bits, Green: 16 bits, Blue: 16 bits, Alpha: 16 bits. **/

    WINDOW_FORMAT_RGBA_FP16          = 0x16,

    /** Red: 16 bits, Green: 16 bits, Blue: 16 bits, Unused: 16 bits. **/

    WINDOW_FORMAT_RGBX_FP16          = 0x17,

};



struct ANativeWindow;

include/ui/PixelFormat.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ enum { 
    PIXEL_FORMAT_RGBA_5551   = 6,                            // 16-bit ARGB

    PIXEL_FORMAT_RGBA_4444   = 7,                            // 16-bit ARGB

    PIXEL_FORMAT_RGBA_FP16   = HAL_PIXEL_FORMAT_RGBA_FP16,   // 64-bit RGBA

    PIXEL_FORMAT_RGBX_FP16   = HAL_PIXEL_FORMAT_RGBX_FP16,   // 64-bit RGB0

};



typedef int32_t PixelFormat;

libs/gui/CpuConsumer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ static bool isPossiblyYUV(PixelFormat format) { 
        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_BGRA_8888:

libs/gui/GLConsumer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -859,7 +859,6 @@ void GLConsumer::computeTransformMatrix(float outTransform[16], 
                case PIXEL_FORMAT_RGBA_8888:

                case PIXEL_FORMAT_RGBX_8888:

                case PIXEL_FORMAT_RGBA_FP16:

                case PIXEL_FORMAT_RGBX_FP16:

                case PIXEL_FORMAT_RGB_888:

                case PIXEL_FORMAT_RGB_565:

                case PIXEL_FORMAT_BGRA_8888:

libs/ui/PixelFormat.cpp

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ namespace android { 
uint32_t bytesPerPixel(PixelFormat format) {

    switch (format) {

        case PIXEL_FORMAT_RGBA_FP16:

        case PIXEL_FORMAT_RGBX_FP16:

            return 8;

        case PIXEL_FORMAT_RGBA_8888:

        case PIXEL_FORMAT_RGBX_8888:
@@ -42,7 +41,6 @@ uint32_t bytesPerPixel(PixelFormat format) { 
uint32_t bitsPerPixel(PixelFormat format) {

    switch (format) {

        case PIXEL_FORMAT_RGBA_FP16:

        case PIXEL_FORMAT_RGBX_FP16:

            return 64;

        case PIXEL_FORMAT_RGBA_8888:

        case PIXEL_FORMAT_RGBX_8888: