summaryrefslogtreecommitdiff
path: root/libs/ui/Gralloc3.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-06-17 18:51:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-17 18:51:25 +0000
commit579f0c2a2ee68484fa59cf51ea974b5cd0d0a931 (patch)
tree61954eed45f3e97ac0fbc30849f3cdc4e7d34a58 /libs/ui/Gralloc3.cpp
parent1a75b0fd4896fb82f014940a65b0e97c6f7cd21c (diff)
parentfd63570c39c1c327fe015148467401dfb351a965 (diff)
Merge "Merge Android 14 QPR3 to AOSP main" into main
Diffstat (limited to 'libs/ui/Gralloc3.cpp')
-rw-r--r--libs/ui/Gralloc3.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ui/Gralloc3.cpp b/libs/ui/Gralloc3.cpp
index 474d381dbb..152b35a505 100644
--- a/libs/ui/Gralloc3.cpp
+++ b/libs/ui/Gralloc3.cpp
@@ -371,7 +371,7 @@ std::string Gralloc3Allocator::dumpDebugInfo(bool /*less*/) const {
status_t Gralloc3Allocator::allocate(std::string /*requestorName*/, uint32_t width, uint32_t height,
android::PixelFormat format, uint32_t layerCount,
- uint64_t usage, uint32_t bufferCount, uint32_t* outStride,
+ uint64_t usage, uint32_t* outStride,
buffer_handle_t* outBufferHandles, bool importBuffers) const {
IMapper::BufferDescriptorInfo descriptorInfo;
sBufferDescriptorInfo(width, height, format, layerCount, usage, &descriptorInfo);
@@ -383,6 +383,8 @@ status_t Gralloc3Allocator::allocate(std::string /*requestorName*/, uint32_t wid
return error;
}
+ constexpr auto bufferCount = 1;
+
auto ret = mAllocator->allocate(descriptor, bufferCount,
[&](const auto& tmpError, const auto& tmpStride,
const auto& tmpBuffers) {