diff options
| author | Jason Macnak <natsu@google.com> | 2023-04-03 23:26:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-03 23:26:39 +0000 |
| commit | cba28051054e840018d0f998056c83030579a605 (patch) | |
| tree | 6e875bc030bdfb362f5851eb8bde03d87e82d935 | |
| parent | 4803fe50686f76d2f09de7f7b70d6084ed1a578e (diff) | |
| parent | aa86052df7d8cb00646e90dabdb49829610cab65 (diff) | |
| download | minigbm-android14-d2-s5-release.tar.gz | |
Merge "Revert "ANDROID: gralloc: Temporarily disable PixelFormat::R_8"" am: e4fc0b8356 am: f900bc8d9d am: cd4f13f364 am: aa86052df7android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/2517995
Change-Id: I027a614c77afe97a87d96db4f4740bff0b5055d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cros_gralloc/cros_gralloc_helpers.cc | 5 |
1 files changed, 1 insertions, 4 deletions
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 @@ uint32_t cros_gralloc_convert_format(int format) * 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; |