Handle more image properties from external device memory

src/Vulkan/VkDeviceMemory.cpp

@@ -339,11 +339,23 @@ bool DeviceMemory::hasExternalImageProperties() const
 	return external && external->hasExternalImageProperties();
 }
 
-int DeviceMemory::externalImageRowPitchBytes() const
+int DeviceMemory::externalImageRowPitchBytes(VkImageAspectFlagBits aspect) const
 {
 	if(external)
 	{
-		return external->externalImageRowPitchBytes();
+		return external->externalImageRowPitchBytes(aspect);
+	}
+
+	// This function should never be called on non-external memory.
+	ASSERT(false);
+	return -1;
+}
+
+VkDeviceSize DeviceMemory::externalImageMemoryOffset(VkImageAspectFlagBits aspect) const
+{
+	if(external)
+	{
+		return external->externalImageMemoryOffset(aspect);
 	}
 
 	// This function should never be called on non-external memory.

src/Vulkan/VkDeviceMemory.hpp

@@ -58,7 +58,8 @@ public:
 	class ExternalBase;
 
 	bool hasExternalImageProperties() const;
-	int externalImageRowPitchBytes() const;
+	int externalImageRowPitchBytes(VkImageAspectFlagBits aspect) const;
+	VkDeviceSize externalImageMemoryOffset(VkImageAspectFlagBits aspect) const;
 
 private:
 	void *buffer = nullptr;

src/Vulkan/VkDeviceMemoryExternalAndroid.cpp

@@ -23,39 +23,6 @@
 
 namespace {
 
-int GetBytesFromAHBFormat(uint32_t ahbFormat)
-{
-	switch(ahbFormat)
-	{
-		case AHARDWAREBUFFER_FORMAT_D16_UNORM:
-			return 2;
-		case AHARDWAREBUFFER_FORMAT_D24_UNORM:
-			return 3;
-		case AHARDWAREBUFFER_FORMAT_D32_FLOAT:
-			return 4;
-		case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
-			return 4;
-		case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
-			return 8;
-		case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
-			return 2;
-		case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
-			return 4;
-		case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
-			return 4;
-		case AHARDWAREBUFFER_FORMAT_S8_UINT:
-			return 1;
-		default:
-			// TODO(b/165302991)
-			// - AHARDWAREBUFFER_FORMAT_BLOB
-			// - AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT
-			// - AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT
-			// - AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM
-			UNSUPPORTED("Requested bytes() for unsupported format %d", int(ahbFormat));
-			return -1;
-	}
-}
-
 uint32_t GetAHBFormatFromVkFormat(VkFormat format)
 {
 	switch(format)
@@ -385,12 +352,14 @@ VkResult AHardwareBufferExternalMemory::lockAndroidHardwareBuffer(void **pBuffer
 	// Empty rect, lock entire buffer.
 	ARect *rect = nullptr;
 
-	int ret = AHardwareBuffer_lock(ahb, usage, fence, rect, pBuffer);
+	int ret = AHardwareBuffer_lockPlanes(ahb, usage, fence, rect, &ahbPlanes);
 	if(ret != 0)
 	{
 		return VK_ERROR_OUT_OF_HOST_MEMORY;
 	}
 
+	*pBuffer = ahbPlanes.planes[0].data;
+
 	return VK_SUCCESS;
 }
 
@@ -486,9 +455,54 @@ VkResult AHardwareBufferExternalMemory::GetAndroidHardwareBufferProperties(VkDev
 	return result;
 }
 
-int AHardwareBufferExternalMemory::externalImageRowPitchBytes() const
+int AHardwareBufferExternalMemory::externalImageRowPitchBytes(VkImageAspectFlagBits aspect) const
+{
+	switch(ahbDesc.format)
+	{
+		case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420:
+			switch(aspect)
+			{
+				case VK_IMAGE_ASPECT_PLANE_0_BIT:
+					return static_cast<int>(ahbPlanes.planes[0].rowStride);
+				case VK_IMAGE_ASPECT_PLANE_1_BIT:
+					return static_cast<int>(ahbPlanes.planes[1].rowStride);
+				case VK_IMAGE_ASPECT_PLANE_2_BIT:
+					return static_cast<int>(ahbPlanes.planes[2].rowStride);
+				default:
+					UNSUPPORTED("Unsupported aspect %d for AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420", int(aspect));
+					return 0;
+			}
+			break;
+		default:
+			break;
+	}
+	return static_cast<int>(ahbPlanes.planes[0].rowStride);
+}
+
+VkDeviceSize AHardwareBufferExternalMemory::externalImageMemoryOffset(VkImageAspectFlagBits aspect) const
 {
-	return GetBytesFromAHBFormat(ahbDesc.format) * ahbDesc.stride;
+	switch(ahbDesc.format)
+	{
+		case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420:
+			switch(aspect)
+			{
+				case VK_IMAGE_ASPECT_PLANE_0_BIT:
+					return 0;
+				case VK_IMAGE_ASPECT_PLANE_1_BIT:
+					return reinterpret_cast<const char *>(ahbPlanes.planes[1].data) -
+					       reinterpret_cast<const char *>(ahbPlanes.planes[0].data);
+				case VK_IMAGE_ASPECT_PLANE_2_BIT:
+					return reinterpret_cast<const char *>(ahbPlanes.planes[2].data) -
+					       reinterpret_cast<const char *>(ahbPlanes.planes[0].data);
+				default:
+					UNSUPPORTED("Unsupported aspect %d for AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420", int(aspect));
+					return 0;
+			}
+			break;
+		default:
+			break;
+	}
+	return 0;
 }
 
 #ifdef SWIFTSHADER_DEVICE_MEMORY_REPORT

src/Vulkan/VkDeviceMemoryExternalAndroid.hpp

@@ -67,7 +67,8 @@ public:
 	static VkResult GetAndroidHardwareBufferProperties(VkDevice &device, const AHardwareBuffer *buffer, VkAndroidHardwareBufferPropertiesANDROID *pProperties);
 
 	bool hasExternalImageProperties() const override final { return true; }
-	int externalImageRowPitchBytes() const override final;
+	int externalImageRowPitchBytes(VkImageAspectFlagBits aspect) const override final;
+	VkDeviceSize externalImageMemoryOffset(VkImageAspectFlagBits aspect) const override final;
 
 #ifdef SWIFTSHADER_DEVICE_MEMORY_REPORT
 	bool isImport() const override
@@ -85,6 +86,7 @@ private:
 
 	AHardwareBuffer *ahb = nullptr;
 	AHardwareBuffer_Desc ahbDesc = {};
+	AHardwareBuffer_Planes ahbPlanes = {};
 	vk::Device *device = nullptr;
 	AllocateInfo allocateInfo;
 };

src/Vulkan/VkDeviceMemoryExternalBase.hpp

@@ -48,7 +48,8 @@ public:
 	// Some external device memories, such as Android hardware buffers, represent
 	// specific images with requirements.
 	virtual bool hasExternalImageProperties() const { return false; }
-	virtual int externalImageRowPitchBytes() const { return 0; }
+	virtual int externalImageRowPitchBytes(VkImageAspectFlagBits aspect) const { return 0; }
+	virtual VkDeviceSize externalImageMemoryOffset(VkImageAspectFlagBits aspect) const { return 0; }
 
 #ifdef SWIFTSHADER_DEVICE_MEMORY_REPORT
 	virtual bool isImport() const

src/Vulkan/VkImage.cpp

@@ -751,7 +751,7 @@ int Image::rowPitchBytes(VkImageAspectFlagBits aspect, uint32_t mipLevel) const
 {
 	if(deviceMemory && deviceMemory->hasExternalImageProperties())
 	{
-		return deviceMemory->externalImageRowPitchBytes();
+		return deviceMemory->externalImageRowPitchBytes(aspect);
 	}
 
 	// Depth and Stencil pitch should be computed separately
@@ -803,6 +803,11 @@ uint8_t *Image::end() const
 
 VkDeviceSize Image::getMemoryOffset(VkImageAspectFlagBits aspect) const
 {
+	if(deviceMemory && deviceMemory->hasExternalImageProperties())
+	{
+		return deviceMemory->externalImageMemoryOffset(aspect);
+	}
+
 	switch(format)
 	{
 		case VK_FORMAT_D16_UNORM_S8_UINT: