commit 27aa2396f52c600594fbb5bc388e5d22f4a08192
author Sean Callanan <spyffe@google.com> Wed Nov 14 22:10:30 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 30 03:28:19 2018 +0000
tree 870b64628bfb73e3fe9a576b4e4bb6a793218482
parent ea08c46a31ce4e8157a86bc60a5cdfc81e80a147

Revert "Gralloc: Update ADRENOPIXELFORMAT mapping"

This reverts commit 106db0d716e59be69f80eb88b4940fc2a9847911.

Reason for revert: Unblock Night Sight
Bug: 118982104

Change-Id: Iad935385e772f70c8c3eeca45c83c2a51856ac1f
(cherry picked from commit a77f975cb47cc60b997e47e1f62b3253325934d8)

gralloc/gr_adreno_info.cpp

diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp
index 04812cc..acc2134 100644
--- a/gralloc/gr_adreno_info.cpp
+++ b/gralloc/gr_adreno_info.cpp
@@ -221,7 +221,7 @@
     case HAL_PIXEL_FORMAT_DEPTH_16:
       return ADRENO_PIXELFORMAT_D16_UNORM;
     case HAL_PIXEL_FORMAT_DEPTH_24:
-      return ADRENO_PIXELFORMAT_D24_UNORM_X8_UINT;
+      return ADRENO_PIXELFORMAT_D24_UNORM;
     case HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8:
       return ADRENO_PIXELFORMAT_D24_UNORM_S8_UINT;
     case HAL_PIXEL_FORMAT_DEPTH_32F:

gralloc/gr_adreno_info.h

diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index c745cfe..eec7da4 100644
--- a/gralloc/gr_adreno_info.h
+++ b/gralloc/gr_adreno_info.h
@@ -63,7 +63,6 @@
   ADRENO_PIXELFORMAT_A2B10G10R10_UNORM = 532,
   // Vertex, Normalized GL_UNSIGNED_INT_10_10_10_2_OES
   ADRENO_PIXELFORMAT_R10G10B10X2_UNORM = 537,
-  ADRENO_PIXELFORMAT_D24_UNORM_X8_UINT = 548,
   ADRENO_PIXELFORMAT_D24_UNORM = 549,
   ADRENO_PIXELFORMAT_D32_FLOAT_X24S8_UINT = 551,
   ADRENO_PIXELFORMAT_S8_UINT = 552,