ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Include vendor gralloc0 flags in gralloc1 conversion."" into oc-dev

Browse source 
am: 3433cbd567

Change-Id: I049a295140327c982ece8946187cf8b0d8cc678d
This commit is contained in:
Yin-Chia Yeh 2017-04-04 22:28:01 +00:00 • committed by android-build-merger
commit baef8fd8e0
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libgrallocusage/GrallocUsageConversion.cpp
View file

@ -30,17 +30,13 @@ void android_convertGralloc0To1Usage(int32_t usage, uint64_t* producerUsage,
/* ProducerUsage::CPU_WRITE_OFTEN | */
ProducerUsage::GPU_RENDER_TARGET | ProducerUsage::PROTECTED |
ProducerUsage::CAMERA | ProducerUsage::VIDEO_DECODER |
ProducerUsage::SENSOR_DIRECT_DATA |
/* Private flags may be consumer or producer */
GRALLOC_USAGE_PRIVATE_MASK;
ProducerUsage::SENSOR_DIRECT_DATA;
constexpr uint64_t CONSUMER_MASK = ConsumerUsage::CPU_READ |
/* ConsumerUsage::CPU_READ_OFTEN | */
ConsumerUsage::GPU_TEXTURE | ConsumerUsage::HWCOMPOSER |
ConsumerUsage::CLIENT_TARGET | ConsumerUsage::CURSOR |
ConsumerUsage::VIDEO_ENCODER | ConsumerUsage::CAMERA |
ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER |
/* Private flags may be consumer or producer */
GRALLOC_USAGE_PRIVATE_MASK;
ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER;
*producerUsage = static_cast<uint64_t>(usage) & PRODUCER_MASK;
*consumerUsage = static_cast<uint64_t>(usage) & CONSUMER_MASK;
if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_READ_OFTEN) == GRALLOC_USAGE_SW_READ_OFTEN) {