diff options
| author | Roman Kiryanov <rkir@google.com> | 2019-04-23 16:48:06 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2019-04-24 13:36:12 -0700 |
| commit | 6832185dea7b0705f96128e598bb138610f23385 (patch) | |
| tree | 14686cc3da49fedc313b74a002272579d7a32a9c | |
| parent | 893dc100909a56ef052394f1bbc66faeba8dc50c (diff) | |
| download | goldfish-opengl-6832185dea7b0705f96128e598bb138610f23385.tar.gz | |
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>
| -rw-r--r-- | system/gralloc/gralloc.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp index aace8e3f..d39d99ab 100644 --- a/system/gralloc/gralloc.cpp +++ b/system/gralloc/gralloc.cpp @@ -506,10 +506,6 @@ static int gralloc_alloc(alloc_device_t* dev, } 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 @@ static int gralloc_alloc(alloc_device_t* dev, 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 |