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

Commit 28ba79fb authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Add BGRA1010102 pixelformat" into main

parents f21740b5 c907bc6f

libs/nativewindow/AHardwareBuffer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ static_assert(static_cast<int>( 
                      aidl::android::hardware::graphics::common::PixelFormat::RGBA_14141414_UINT) ==

                      AHARDWAREBUFFER_FORMAT_R14G14B14A14_UINT,

              "HAL and AHardwareBuffer pixel format don't match");

static_assert(

        static_cast<int>(aidl::android::hardware::graphics::common::PixelFormat::BGRA_1010102) ==

                AHARDWAREBUFFER_FORMAT_B10G10R10A2_UNORM,

        "HAL and AHardwareBuffer pixel format don't match");



static enum AHardwareBufferStatus filterStatus(status_t status) {

    switch (status) {

libs/nativewindow/include/android/hardware_buffer.h

+8 −0
Original line number Diff line number Diff line
@@ -251,6 +251,14 @@ enum AHardwareBuffer_Format { 
     *   OpenGL ES: N/A

     */

    AHARDWAREBUFFER_FORMAT_R14G14B14A14_UINT= 0x42,



    /**

     * Corresponding formats:

     *   Vulkan: VK_FORMAT_A2A10G10B10_UNORM_PACK32

     *   OpenGL ES: N/A

     */

    AHARDWAREBUFFER_FORMAT_B10G10R10A2_UNORM        = 0x43,



};



/**