OSDN Git Service
(root)
/
android-x86
/
external-minigbm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Distinguish COMPOSER_TARGET_BUFFER
[android-x86/external-minigbm.git]
/
cros_gralloc
/
gralloc4
/
CrosGralloc4Utils.cc
diff --git
a/cros_gralloc/gralloc4/CrosGralloc4Utils.cc
b/cros_gralloc/gralloc4/CrosGralloc4Utils.cc
index
1296b07
..
0e0c572
100644
(file)
--- a/
cros_gralloc/gralloc4/CrosGralloc4Utils.cc
+++ b/
cros_gralloc/gralloc4/CrosGralloc4Utils.cc
@@
-113,6
+113,10
@@
std::string getUsageString(hidl_bitfield<BufferUsage> bufferUsage) {
usage &= ~static_cast<Underlying>(BufferUsage::COMPOSER_OVERLAY);
usages.push_back("BufferUsage::COMPOSER_OVERLAY");
}
usage &= ~static_cast<Underlying>(BufferUsage::COMPOSER_OVERLAY);
usages.push_back("BufferUsage::COMPOSER_OVERLAY");
}
+ if (usage & BufferUsage::COMPOSER_CLIENT_TARGET) {
+ usage &= ~static_cast<Underlying>(BufferUsage::COMPOSER_CLIENT_TARGET);
+ usages.push_back("BufferUsage::COMPOSER_CLIENT_TARGET");
+ }
if (usage & BufferUsage::CPU_READ_OFTEN) {
usage &= ~static_cast<Underlying>(BufferUsage::CPU_READ_OFTEN);
usages.push_back("BufferUsage::CPU_READ_OFTEN");
if (usage & BufferUsage::CPU_READ_OFTEN) {
usage &= ~static_cast<Underlying>(BufferUsage::CPU_READ_OFTEN);
usages.push_back("BufferUsage::CPU_READ_OFTEN");
@@
-282,6
+286,10
@@
int convertToBufferUsage(uint64_t grallocUsage, uint64_t* outBufferUsage) {
/* HWC wants to use display hardware, but can defer to OpenGL. */
bufferUsage |= BO_USE_SCANOUT | BO_USE_TEXTURE;
}
/* HWC wants to use display hardware, but can defer to OpenGL. */
bufferUsage |= BO_USE_SCANOUT | BO_USE_TEXTURE;
}
+ if (grallocUsage & BufferUsage::COMPOSER_CLIENT_TARGET) {
+ /* GPU composition target buffer */
+ bufferUsage |= BO_USE_COMPOSER_TARGET;
+ }
/* Map this flag to linear until real HW protection is available on Android. */
if (grallocUsage & BufferUsage::PROTECTED) {
bufferUsage |= BO_USE_LINEAR;
/* Map this flag to linear until real HW protection is available on Android. */
if (grallocUsage & BufferUsage::PROTECTED) {
bufferUsage |= BO_USE_LINEAR;