| commit | bc0ad9315ec3391810adc3800ef7609fd094f5f0 | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri May 14 15:48:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 15:48:28 2021 +0000 |
| tree | 1707b4b0e66678c11e72c7c5e55708a05770fd6a | |
| parent | 93b7f01f83168b14e2abd83407710eb06dc4d627 [diff] | |
| parent | 980ea215e36aac0cda10dfa6e7adf2f1aac4f3cd [diff] |
Merge "c2-codecs: do not create host color buffer for cpu read write only usage" am: 980ea215e3 Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1704150 Change-Id: I0ad0e9556a1706ca889ce0f6710a659a8d4b3349
diff --git a/system/hals/allocator3.cpp b/system/hals/allocator3.cpp index c91bafd..5c103a5 100644 --- a/system/hals/allocator3.cpp +++ b/system/hals/allocator3.cpp
@@ -323,6 +323,12 @@ return false; } + // b/186585177 + if ((usage & (BufferUsage::CPU_READ_MASK | BufferUsage::CPU_WRITE_MASK)) && + (0 == (usage & ~(BufferUsage::CPU_READ_MASK | BufferUsage::CPU_WRITE_MASK)))) { + return false; + } + return ((usage & BufferUsage::GPU_DATA_BUFFER) || (format != PixelFormat::BLOB && format != PixelFormat::RAW16 &&