diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-18 07:59:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-18 07:59:42 -0700 |
| commit | 664c7657569bde1b6574bb3b466a25113d7699d8 (patch) | |
| tree | c7874768a424dd6c571e24c78689c9576256e063 | |
| parent | 96ba3bc37cfb2a9fe80bd332c433f120f9d7ea96 (diff) | |
| parent | 4f612ae6e4a20f5e6fa5f733fe3b3029e57ecad8 (diff) | |
| download | display-664c7657569bde1b6574bb3b466a25113d7699d8.tar.gz | |
Merge "Gralloc: Update ADRENOPIXELFORMAT mapping"
| -rw-r--r-- | gralloc/gr_adreno_info.cpp | 2 | ||||
| -rw-r--r-- | gralloc/gr_adreno_info.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp index 1aa56975..ed759e74 100644 --- a/gralloc/gr_adreno_info.cpp +++ b/gralloc/gr_adreno_info.cpp @@ -226,7 +226,7 @@ ADRENOPIXELFORMAT AdrenoMemInfo::GetGpuPixelFormat(int hal_format) { case HAL_PIXEL_FORMAT_DEPTH_16: return ADRENO_PIXELFORMAT_D16_UNORM; case HAL_PIXEL_FORMAT_DEPTH_24: - return ADRENO_PIXELFORMAT_D24_UNORM; + return ADRENO_PIXELFORMAT_D24_UNORM_X8_UINT; case HAL_PIXEL_FORMAT_DEPTH_24_STENCIL_8: return ADRENO_PIXELFORMAT_D24_UNORM_S8_UINT; case HAL_PIXEL_FORMAT_DEPTH_32F: diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h index 712e91d8..7c32caea 100644 --- a/gralloc/gr_adreno_info.h +++ b/gralloc/gr_adreno_info.h @@ -63,6 +63,7 @@ typedef enum { ADRENO_PIXELFORMAT_A2B10G10R10_UNORM = 532, // Vertex, Normalized GL_UNSIGNED_INT_10_10_10_2_OES ADRENO_PIXELFORMAT_R10G10B10X2_UNORM = 537, + ADRENO_PIXELFORMAT_D24_UNORM_X8_UINT = 548, ADRENO_PIXELFORMAT_D24_UNORM = 549, ADRENO_PIXELFORMAT_D32_FLOAT_X24S8_UINT = 551, ADRENO_PIXELFORMAT_S8_UINT = 552, |