commit | 9b05077bc12b7b13ad680bfaec35ddd3cff5dd93 | [log] [tgz] |
---|---|---|
author | Jason Macnak <natsu@google.com> | Mon Apr 03 23:26:29 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 03 23:26:29 2023 +0000 |
tree | 6e875bc030bdfb362f5851eb8bde03d87e82d935 | |
parent | 8bfb9db374189945f6bfd8948b5d8cecbf5a2083 [diff] | |
parent | aa86052df7d8cb00646e90dabdb49829610cab65 [diff] |
Merge "Revert "ANDROID: gralloc: Temporarily disable PixelFormat::R_8"" am: e4fc0b8356 am: f900bc8d9d am: cd4f13f364 am: aa86052df7 Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2517995 Change-Id: Ie9f684e5a95cfbc3fd86a092367d0d90a1750282 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc index a7c024c..8c86c66 100644 --- a/cros_gralloc/cros_gralloc_helpers.cc +++ b/cros_gralloc/cros_gralloc_helpers.cc
@@ -56,10 +56,7 @@ * equal to their size in bytes. */ case HAL_PIXEL_FORMAT_BLOB: - /* - * TODO(b/259551816): re-enable after ANGLE and SwiftShader are updated. - * case HAL_PIXEL_FORMAT_R8: - */ + case HAL_PIXEL_FORMAT_R8: return DRM_FORMAT_R8; case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: return DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED;