commit 3c73507d08b59ef9abd964a6d363879126eddac3
author Hernan Liatis <hliatis@google.com> Mon Jun 10 15:07:18 2019 -0700
committer Hernan Liatis <hliatis@google.com> Wed Jun 12 00:40:58 2019 +0000
tree 5d8ae9e7f689c19d46cf2afbc739a8cd3d82492c
parent 8af8b40ebd62faa12865ca0d8f31d14629d82eab

Allow default construction of BackingMemory on Android

CL:32489 caused a compilation error on Android since it
implicitly deletes BackingMemory's default constructor.

Change-Id: I48d415aed8ad0166d8d2bd61d06d9ad5ba8a565c
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32629
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Tested-by: Hernan Liatis <hliatis@google.com>

src/Vulkan/libVulkan.cpp

diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 396e2f2..1cf61d4 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -968,7 +968,7 @@
 struct BackingMemory {
 	buffer_handle_t nativeHandle;
 	int stride;
-	VkDeviceMemory imageMemory;
+	vk::DeviceMemory* imageMemory;
 	VkSwapchainImageUsageFlagsANDROID androidUsage;
 };
 
@@ -1033,13 +1033,17 @@
 		allocInfo.allocationSize = memRequirements.size;
 		allocInfo.memoryTypeIndex = 0;
 
-		result = vkAllocateMemory(device, &allocInfo, nullptr, &backmem.imageMemory);
+		VkDeviceMemory devmem = VK_NULL_HANDLE;
+		result = vkAllocateMemory(device, &allocInfo, nullptr, &devmem);
 		if(result != VK_SUCCESS)
 		{
 			return result;
 		}
 
-		vkBindImageMemory(device, *pImage, backmem.imageMemory, 0);
+		backmem.imageMemory = vk::Cast(devmem);
+		vkBindImageMemory(device, *pImage, devmem, 0);
+
+		vk::deallocate(vkDeviceMemoryPtr, vk::DEVICE_MEMORY);
 
 		androidSwapchainMap[*pImage] = backmem;
 	}
@@ -1060,7 +1064,7 @@
 
 	if (it != androidSwapchainMap.end())
 	{
-		vk::destroy((it->second).imageMemory, nullptr);
+		vk::destroy(static_cast<VkDeviceMemory>(*((it->second).imageMemory)), nullptr);
 		androidSwapchainMap.erase(it);
 	}
 #endif
@@ -2822,7 +2826,7 @@
 	VkExtent3D extent = vk::Cast(image)->getMipLevelExtent(VK_IMAGE_ASPECT_COLOR_BIT, 0);
 	grallocMod->lock(backmem.nativeHandle, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, extent.width, extent.height, &nativeBuffer);
 
-	char* buffer = static_cast<char*>(vk::Cast(backmem.imageMemory)->getOffsetPointer(0));
+	char* buffer = static_cast<char*>(backmem.imageMemory->getOffsetPointer(0));
 	int imageRowBytes = vk::Cast(image)->rowPitchBytes(VK_IMAGE_ASPECT_COLOR_BIT, 0);
 	int colorBytes = vk::Cast(image)->getFormat().bytes();