diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-10-18 15:09:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-18 15:09:34 -0700 |
| commit | a3145aed062d11ebb79df0cb97e197e98cd88766 (patch) | |
| tree | f60a848f168912855296c1454f87d678c97cbc94 | |
| parent | cbacadadfec5feeb1723c9d3dba36f1b354d02bc (diff) | |
| parent | f3eec4bc26b9e6611b5b1380ac17d39042d98dd5 (diff) | |
| download | drm_hwcomposer-a3145aed062d11ebb79df0cb97e197e98cd88766.tar.gz | |
Merge remote-tracking branch 'upstream-master' into HEAD am: 6e37ec1ce0 am: 272572bb63
am: f3eec4bc26
Change-Id: Ib9da312b38da0f3c257a2a0b727ac209dfa1d9aa
| -rw-r--r-- | platform/platformmeson.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/platformmeson.cpp b/platform/platformmeson.cpp index 58ec5c0..7bde5cd 100644 --- a/platform/platformmeson.cpp +++ b/platform/platformmeson.cpp @@ -51,15 +51,16 @@ Importer *Importer::CreateInstance(DrmDevice *drm) { uint64_t MesonImporter::ConvertGrallocFormatToDrmModifiers(uint64_t flags) { uint64_t features = 0UL; - if (flags & MALI_GRALLOC_INTFMT_AFBC_BASIC) - features |= AFBC_FORMAT_MOD_BLOCK_SIZE_16x16; + if (flags & MALI_GRALLOC_INTFMT_AFBC_BASIC) { + if (flags & MALI_GRALLOC_INTFMT_AFBC_WIDEBLK) + features |= AFBC_FORMAT_MOD_BLOCK_SIZE_32x8; + else + features |= AFBC_FORMAT_MOD_BLOCK_SIZE_16x16; + } if (flags & MALI_GRALLOC_INTFMT_AFBC_SPLITBLK) features |= (AFBC_FORMAT_MOD_SPLIT | AFBC_FORMAT_MOD_SPARSE); - if (flags & MALI_GRALLOC_INTFMT_AFBC_WIDEBLK) - features |= AFBC_FORMAT_MOD_BLOCK_SIZE_32x8; - if (flags & MALI_GRALLOC_INTFMT_AFBC_TILED_HEADERS) features |= AFBC_FORMAT_MOD_TILED; |