Revert "Gralloc: Update ADRENOPIXELFORMAT mapping"
This reverts commit 106db0d716e59be69f80eb88b4940fc2a9847911.
Reason for revert: Unblock Night Sight
Bug: 118982104
Change-Id: Iad935385e772f70c8c3eeca45c83c2a51856ac1f
diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp
index c8c271c..895c658 100644
--- a/gralloc/gr_adreno_info.cpp
+++ b/gralloc/gr_adreno_info.cpp
@@ -226,7 +226,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:
diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index 74dade1..88d09d5 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,