From 060a59992d459e7a880facb9b463b5e9354ebc50 Mon Sep 17 00:00:00 2001
From: Trevor David Black <vantablack@google.com>
Date: Mon, 5 Dec 2022 16:07:57 +0000
Subject: [PATCH] The aidl changes necessary to add requested AHB format enums

PIXEL_FORMAT_R_16_UINT
- AHARDWAREBUFFER_FORMAT_R16_UINT
PIXEL_FORMAT_RG_1616_UINT
- AHARDWAREBUFFER_FORMAT_R16G16_UINT
PIXEL_FORMAT_RGBA_10101010
- AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM

Bug: 233033456
Test: Build
Change-Id: I7b9829f549dd6d931531f14fef458d1fecc82ac9
---
 .../hardware/graphics/common/PixelFormat.aidl |  3 +++
 .../hardware/graphics/common/PixelFormat.aidl | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/PixelFormat.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/PixelFormat.aidl
index 59d6468d54..68857e816f 100644
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/PixelFormat.aidl
+++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/PixelFormat.aidl
@@ -65,4 +65,7 @@ enum PixelFormat {
   YCBCR_P010 = 54,
   HSV_888 = 55,
   R_8 = 56,
+  R_16_UINT = 57,
+  RG_1616_UINT = 58,
+  RGBA_10101010 = 59,
 }
diff --git a/graphics/common/aidl/android/hardware/graphics/common/PixelFormat.aidl b/graphics/common/aidl/android/hardware/graphics/common/PixelFormat.aidl
index ccf437bdb2..2985212ed5 100644
--- a/graphics/common/aidl/android/hardware/graphics/common/PixelFormat.aidl
+++ b/graphics/common/aidl/android/hardware/graphics/common/PixelFormat.aidl
@@ -506,4 +506,30 @@ enum PixelFormat {
      * The component values are unsigned normalized to the range [0, 1].
      */
     R_8 = 0x38,
+
+    /**
+     * 16-bit format with a single 16-bit component
+     *
+     * The component values are unsigned integers, whose interpretation is
+     * defined by the dataspace.
+     */
+    R_16_UINT = 0x39,
+
+    /**
+     * 32-bit format that has 16-bit R and G components, in that order,
+     * from the lowest memory address to the highest memory address.
+     *
+     * The component values are unsigned integers, whose interpretation is
+     * defined by the dataspace.
+     */
+    RG_1616_UINT = 0x3a,
+
+    /**
+     * 40-bit format that has 10-bit R, G, B, and A components, in that order,
+     * from the lowest memory address to the highest memory address.
+     *
+     * The component values are unsigned normalized to the range [0, 1], whose
+     * interpretation is defined by the dataspace.
+     */
+    RGBA_10101010 = 0x3b,
 }