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

Commit d0b2562f authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "Fix AHardwareBuffer 10:10:10:2 format" into oc-dev 

am: ec371741

Change-Id: I1dc48784cf8b29d2c5f5199230d34d16c4a5ecbb
parents 1c8b3073 ec371741

libs/nativewindow/AHardwareBuffer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ uint32_t AHardwareBuffer_convertFromPixelFormat(uint32_t format) { 
        case HAL_PIXEL_FORMAT_RGBX_8888:    return AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM;

        case HAL_PIXEL_FORMAT_RGB_565:      return AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM;

        case HAL_PIXEL_FORMAT_RGB_888:      return AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM;

        case HAL_PIXEL_FORMAT_RGBA_FP16:    return AHARDWAREBUFFER_FORMAT_R16G16B16A16_SFLOAT;

        case HAL_PIXEL_FORMAT_RGBA_1010102: return AHARDWAREBUFFER_FORMAT_A2R10G10B10_UNORM_PACK32;

        case HAL_PIXEL_FORMAT_RGBA_FP16:    return AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT;

        case HAL_PIXEL_FORMAT_RGBA_1010102: return AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM;

        case HAL_PIXEL_FORMAT_BLOB:         return AHARDWAREBUFFER_FORMAT_BLOB;

        default:ALOGE("Unknown pixel format %u", format);

            return 0;
@@ -372,8 +372,8 @@ uint32_t AHardwareBuffer_convertToPixelFormat(uint32_t format) { 
        case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:         return HAL_PIXEL_FORMAT_RGBX_8888;

        case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:           return HAL_PIXEL_FORMAT_RGB_565;

        case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:           return HAL_PIXEL_FORMAT_RGB_888;

        case AHARDWAREBUFFER_FORMAT_R16G16B16A16_SFLOAT:    return HAL_PIXEL_FORMAT_RGBA_FP16;

        case AHARDWAREBUFFER_FORMAT_A2R10G10B10_UNORM_PACK32: return HAL_PIXEL_FORMAT_RGBA_1010102;

        case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:     return HAL_PIXEL_FORMAT_RGBA_FP16;

        case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:      return HAL_PIXEL_FORMAT_RGBA_1010102;

        case AHARDWAREBUFFER_FORMAT_BLOB:                   return HAL_PIXEL_FORMAT_BLOB;

        default:ALOGE("Unknown AHardwareBuffer format %u", format);

            return 0;

libs/nativewindow/include/android/hardware_buffer.h

+3 −3
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ enum { 
     *   Vulkan: VK_FORMAT_R16G16B16A16_SFLOAT

     *   OpenGL ES: GL_RGBA16F

     */

    AHARDWAREBUFFER_FORMAT_R16G16B16A16_SFLOAT      = 0x16,

    AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT       = 0x16,



    /**

     * Corresponding formats:

     *   Vulkan: VK_FORMAT_A2R10G10B10_UNORM_PACK32

     *   Vulkan: VK_FORMAT_A2B10G10R10_UNORM_PACK32

     *   OpenGL ES: GL_RGB10_A2

     */

    AHARDWAREBUFFER_FORMAT_A2R10G10B10_UNORM_PACK32 = 0x2b,

    AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM        = 0x2b,



    /**

     * An opaque binary blob format that must have height 1, with width equal to