Merge "graphics: fix gralloc1 usage flags in default impl" into oc-dr1-dev (1029762e) · Commits · e / os / android_hardware_interfaces

graphics/allocator/2.0/default/Gralloc1Allocator.cpp

+12 −4

Original line number	Diff line number	Diff line
		@@ -200,8 +200,8 @@ uint64_t Gralloc1Allocator::toProducerUsage(uint64_t usage) {
		// should be filtered out
		uint64_t producerUsage =
		usage &
		~static_cast<uint64_t>(BufferUsage::CPU_READ_MASK \|
		BufferUsage::CPU_WRITE_MASK);
		~static_cast<uint64_t>(BufferUsage::CPU_READ_MASK \| BufferUsage::CPU_WRITE_MASK \|
		BufferUsage::GPU_DATA_BUFFER);

		switch (usage & BufferUsage::CPU_WRITE_MASK) {
		case static_cast<uint64_t>(BufferUsage::CPU_WRITE_RARELY):
		@@ -225,6 +225,8 @@ uint64_t Gralloc1Allocator::toProducerUsage(uint64_t usage) {
		break;
		}

		// BufferUsage::GPU_DATA_BUFFER is always filtered out

		return producerUsage;
		}

		@@ -233,8 +235,8 @@ uint64_t Gralloc1Allocator::toConsumerUsage(uint64_t usage) {
		// should be filtered out
		uint64_t consumerUsage =
		usage &
		~static_cast<uint64_t>(BufferUsage::CPU_READ_MASK \|
		BufferUsage::CPU_WRITE_MASK);
		~static_cast<uint64_t>(BufferUsage::CPU_READ_MASK \| BufferUsage::CPU_WRITE_MASK \|
		BufferUsage::SENSOR_DIRECT_DATA \| BufferUsage::GPU_DATA_BUFFER);

		switch (usage & BufferUsage::CPU_READ_MASK) {
		case static_cast<uint64_t>(BufferUsage::CPU_READ_RARELY):
		@@ -247,6 +249,12 @@ uint64_t Gralloc1Allocator::toConsumerUsage(uint64_t usage) {
		break;
		}

		// BufferUsage::SENSOR_DIRECT_DATA is always filtered out

		if (usage & BufferUsage::GPU_DATA_BUFFER) {
		consumerUsage \|= GRALLOC1_CONSUMER_USAGE_GPU_DATA_BUFFER;
		}

		return consumerUsage;
		}