Retire HAL_PIXEL_FORMAT_RGB_888 from gralloc
This is not a must and adds confusion between
OpenGL (supported) and Vulkan (not supported)
they are mixed (e.g. AHardwareBuffer_allocate
which goes though OpenGL)
Bug: 131184223
Test: lunch sdk_gphone_x86-userdebug
Test: emulator -wipe-data -no-snapshot -show-kernel -feature Vulkan,GLDirectMem
Test: ./android-cts/tools/cts-tradefed -- run cts -m CtsGraphicsTestCases
Test: emulator -wipe-data -no-snapshot -feature GLESDynamicVersion,PlayStoreImage,KernelDeviceTreeBlobSupport -gpu host
Test: ./android-cts/tools/cts-tradefed -- run cts -m CtsNativeHardwareTestCases
Test: ./android-cts/tools/cts-tradefed -- run cts -m CtsGraphicsTestCases
Test: ./android-cts/tools/cts-tradefed -- run cts -m CtsCameraTestCases
Change-Id: Idb5d5885efd18219c86cc1b76722d41f49d68d03
Merged-In: Ie6f40c717a36ae4a9ef477cc420dc083b63ffbc3
Signed-off-by: Roman Kiryanov <rkir@google.com>
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index aace8e3..d39d99a 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -506,10 +506,6 @@
} else if (usage & GRALLOC_USAGE_HW_VIDEO_ENCODER) {
// Camera-to-encoder is NV21
format = HAL_PIXEL_FORMAT_YCrCb_420_SP;
- } else if ((usage & GRALLOC_USAGE_HW_CAMERA_MASK) ==
- GRALLOC_USAGE_HW_CAMERA_ZSL) {
- // Camera-to-ZSL-queue is RGB_888
- format = HAL_PIXEL_FORMAT_RGB_888;
}
}
@@ -545,11 +541,6 @@
glFormat = GL_RGBA;
glType = GL_UNSIGNED_BYTE;
break;
- case HAL_PIXEL_FORMAT_RGB_888:
- bpp = 3;
- glFormat = GL_RGB;
- glType = GL_UNSIGNED_BYTE;
- break;
case HAL_PIXEL_FORMAT_RGB_565:
bpp = 2;
// Workaround: distinguish vs the RGB8/RGBA8