diff options
| author | Cyan_Hsieh <cyanhsieh@google.com> | 2018-06-07 15:34:53 +0800 |
|---|---|---|
| committer | Cyan_Hsieh <cyanhsieh@google.com> | 2018-06-07 15:34:53 +0800 |
| commit | 483a3e6f8a103ee573e89eb3febf758475b97fc4 (patch) | |
| tree | 025ab12eee4057472a3cb5b5e580d1c6bfd562de /gralloc | |
| parent | 0f70014cd46783eba88bb9d79820d048926f05ab (diff) | |
| parent | 63f128a9e3e4ee6778cd9ba9e2c7829e6241917f (diff) | |
| download | display-483a3e6f8a103ee573e89eb3febf758475b97fc4.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.356' into pi-dev
Conflicts:
sdm/libs/core/drm/hw_device_drm.h
sdm/libs/core/drm/hw_device_drm.cpp
Bug: 109547412
Change-Id: I4b573a7003643a028bb6f9ee8dda20a2d2f26cba
Diffstat (limited to 'gralloc')
| -rw-r--r-- | gralloc/gr_buf_mgr.cpp | 1 | ||||
| -rw-r--r-- | gralloc/gr_utils.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp index 0b6567da..e7c7f0f4 100644 --- a/gralloc/gr_buf_mgr.cpp +++ b/gralloc/gr_buf_mgr.cpp @@ -321,6 +321,7 @@ Error BufferManager::AllocateBuffer(const BufferDescriptor &descriptor, buffer_h int buffer_type = GetBufferType(format); BufferInfo info = GetBufferInfo(descriptor); info.format = format; + info.layer_count = layer_count; bool use_adreno_for_size = false; GraphicsMetadata graphics_metadata = {}; diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp index 8d113a96..3525403e 100644 --- a/gralloc/gr_utils.cpp +++ b/gralloc/gr_utils.cpp @@ -967,9 +967,12 @@ void GetGpuResourceSizeAndDimensions(const BufferInfo &info, unsigned int *size, } // Call adreno api for populating metadata blob + // Layer count is for 2D/Cubemap arrays and depth is used for 3D slice + // Using depth to pass layer_count here int ret = adreno_mem_info->AdrenoInitMemoryLayout(graphics_metadata->data, info.width, - info.height, 1, info.format, 1, - is_ubwc_enabled, adreno_usage, 1); + info.height, info.layer_count, /* depth */ + info.format, 1, is_ubwc_enabled, + adreno_usage, 1); if (ret != 0) { ALOGE("%s Graphics metadata init failed", __FUNCTION__); *size = 0; |