commit 83e57acdb9ee9df0c9ba9030bcb20dff22244e31
author Greg Schlomoff <gregschlom@google.com> Mon Nov 07 12:50:35 2022 -0800
committer Greg Schlomoff <gregschlom@google.com> Mon Nov 07 12:57:16 2022 -0800
tree 7865319a0b970f8fd592e3b8d171f70e57e8ebc0
parent dfeefc2f403b3728338a89d3dc3b019425caebb0

Fix minor vulkan validation errors in teardownGlobalVkEmulation.

Bug: 258032371
Change-Id: I71890470f85d4861d92abe2647aaf3ef26440025

stream-servers/vulkan/VkCommonOperations.cpp

diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp
index 1ee697f..70929f7 100644
--- a/stream-servers/vulkan/VkCommonOperations.cpp
+++ b/stream-servers/vulkan/VkCommonOperations.cpp
@@ -643,7 +643,8 @@
     sVkEmulation->vulkanInstanceVersion = appInfo.apiVersion;
 
     sVkEmulation->instanceSupportsExternalMemoryCapabilities = externalMemoryCapabilitiesSupported;
-    sVkEmulation->instanceSupportsExternalSemaphoreCapabilities = externalSemaphoreCapabilitiesSupported;
+    sVkEmulation->instanceSupportsExternalSemaphoreCapabilities =
+        externalSemaphoreCapabilitiesSupported;
 #ifdef VK_MVK_moltenvk
     sVkEmulation->instanceSupportsMoltenVK = moltenVKSupported;
 #endif
@@ -1217,6 +1218,17 @@
 
     freeExternalMemoryLocked(sVkEmulation->dvk, &sVkEmulation->staging.memory);
 
+    sVkEmulation->dvk->vkDestroyBuffer(sVkEmulation->device, sVkEmulation->staging.buffer, nullptr);
+
+    sVkEmulation->dvk->vkDestroyFence(sVkEmulation->device, sVkEmulation->commandBufferFence,
+                                      nullptr);
+
+    sVkEmulation->dvk->vkFreeCommandBuffers(sVkEmulation->device, sVkEmulation->commandPool, 1,
+                                            &sVkEmulation->commandBuffer);
+
+    sVkEmulation->dvk->vkDestroyCommandPool(sVkEmulation->device, sVkEmulation->commandPool,
+                                            nullptr);
+
     sVkEmulation->ivk->vkDestroyDevice(sVkEmulation->device, nullptr);
     sVkEmulation->gvk->vkDestroyInstance(sVkEmulation->instance, nullptr);
 
@@ -1226,15 +1238,12 @@
 }
 
 std::unique_ptr<gfxstream::DisplaySurface> createDisplaySurface(FBNativeWindowType window,
-                                                                uint32_t width,
-                                                                uint32_t height) {
+                                                                uint32_t width, uint32_t height) {
     if (!sVkEmulation || !sVkEmulation->live) {
         return nullptr;
     }
 
-    auto surfaceVk = DisplaySurfaceVk::create(*sVkEmulation->ivk,
-                                              sVkEmulation->instance,
-                                              window);
+    auto surfaceVk = DisplaySurfaceVk::create(*sVkEmulation->ivk, sVkEmulation->instance, window);
     if (!surfaceVk) {
         VK_COMMON_ERROR("Failed to create DisplaySurfaceVk.");
         return nullptr;