Merge "Revert "Include vendor gralloc0 flags in gralloc1 conversion."" into oc-dev (3433cbd5) · Commits · e / os / android_system_core

libgrallocusage/GrallocUsageConversion.cpp

+2 −6

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