diff options
| author | Sean Callanan <spyffe@google.com> | 2018-11-27 19:09:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-27 19:09:32 -0800 |
| commit | 4efbec80a30bbd46b1e1df77d27696b19399ddb7 (patch) | |
| tree | 68ae6ec261be0fc87776bfeef2ef75c9c1d7f084 /gralloc | |
| parent | 26c492aad74f69b712307db0e62321fb2e62892f (diff) | |
| parent | c24a8517928639540e9dac7c96f21a89e8b8be80 (diff) | |
| download | display-4efbec80a30bbd46b1e1df77d27696b19399ddb7.tar.gz | |
Merge "Revert "Gralloc: Update ADRENOPIXELFORMAT mapping"" into pi-dev am: bf74922ffc
am: c24a851792
Change-Id: I75b29095ac9d6babfedc939e9b636e9f5e7afcd7
Diffstat (limited to 'gralloc')
| -rw-r--r-- | gralloc/gr_adreno_info.cpp | 2 | ||||
| -rw-r--r-- | gralloc/gr_adreno_info.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gralloc/gr_adreno_info.cpp b/gralloc/gr_adreno_info.cpp index 04812cca..acc21349 100644 --- a/gralloc/gr_adreno_info.cpp +++ b/gralloc/gr_adreno_info.cpp @@ -221,7 +221,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_X8_UINT; + return ADRENO_PIXELFORMAT_D24_UNORM; 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 c745cfee..eec7da49 100644 --- a/gralloc/gr_adreno_info.h +++ b/gralloc/gr_adreno_info.h @@ -63,7 +63,6 @@ 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, |