commit e696ebb88ead0b82dd16fd690ecc448d55ea361d
author Tharaga Balachandran <tbalacha@codeaurora.org> Tue Sep 15 10:21:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 15 10:21:04 2020 +0000
tree b26037218535c99fa823f5256396640fb979d579
parent fdbb59b70ce1a89bdd6322b442afd8cdc12bacdf
parent 3fb1c6c0f9c4fd76b678450ac4aa01e23a602928

gralloc: Add support for R8 and RG88 am: 3fb1c6c0f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7250/display/+/12583245

Change-Id: Ib388a70ad29b9df260782f03e50be4953c899f86

gralloc/gr_adreno_info.cpp

diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp
index 2b82dc6..8935def 100644
--- a/gralloc/gr_adreno_info.cpp
+++ b/gralloc/gr_adreno_info.cpp
@@ -194,6 +194,10 @@
       return ADRENO_PIXELFORMAT_R5G5B5A1;
     case HAL_PIXEL_FORMAT_RGBA_4444:
       return ADRENO_PIXELFORMAT_R4G4B4A4;
+    case HAL_PIXEL_FORMAT_R_8:
+      return ADRENO_PIXELFORMAT_R8_UNORM;
+    case HAL_PIXEL_FORMAT_RG_88:
+      return ADRENO_PIXELFORMAT_R8G8_UNORM;
     case HAL_PIXEL_FORMAT_RGBA_1010102:
        return ADRENO_PIXELFORMAT_R10G10B10A2_UNORM;
     case HAL_PIXEL_FORMAT_RGBX_1010102:

gralloc/gr_adreno_info.h

diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index 76fa68a..87c9b51 100644
--- a/gralloc/gr_adreno_info.h
+++ b/gralloc/gr_adreno_info.h
@@ -56,7 +56,9 @@
   ADRENO_PIXELFORMAT_R8G8B8A8_SRGB = 29,
   ADRENO_PIXELFORMAT_D32_FLOAT = 40,
   ADRENO_PIXELFORMAT_D24_UNORM_S8_UINT = 45,
+  ADRENO_PIXELFORMAT_R8G8_UNORM = 49,
   ADRENO_PIXELFORMAT_D16_UNORM = 55,
+  ADRENO_PIXELFORMAT_R8_UNORM = 61,
   ADRENO_PIXELFORMAT_B5G6R5 = 85,
   ADRENO_PIXELFORMAT_B5G5R5A1 = 86,
   ADRENO_PIXELFORMAT_B8G8R8A8_UNORM = 87,

gralloc/gr_utils.cpp

diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index 18bd9a5..570911b 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -201,8 +201,12 @@
     case HAL_PIXEL_FORMAT_BGR_565:
     case HAL_PIXEL_FORMAT_RGBA_5551:
     case HAL_PIXEL_FORMAT_RGBA_4444:
+    case HAL_PIXEL_FORMAT_RG_88:
       bpp = 2;
       break;
+    case HAL_PIXEL_FORMAT_R_8:
+      bpp = 1;
+      break;
     default:
       ALOGE("Error : %s New format request = 0x%x", __FUNCTION__, format);
       break;