From: Tobin Ehlis <tobine@google.com>
Date: Mon, 19 Sep 2016 19:10:37 +0000 (-0600)
Subject: layers: Add in-use check for imageView
X-Git-Tag: accepted/tizen/3.0.m2/mobile/20170105.023708~153
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d85c42a6c1d6ad7a6f684c5bd793aab482b7705c;p=platform%2Fupstream%2FVulkan-LoaderAndValidationLayers.git

layers: Add in-use check for imageView

Add DestroyImageView time, make sure imageView is not in use.
---

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index ca03621..12bc8a0 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -5798,9 +5798,21 @@ GetImageMemoryRequirements(VkDevice device, VkImage image, VkMemoryRequirements
 
 VKAPI_ATTR void VKAPI_CALL
 DestroyImageView(VkDevice device, VkImageView imageView, const VkAllocationCallbacks *pAllocator) {
-    // TODO : Clean up any internal data structures using this obj.
-    get_my_data_ptr(get_dispatch_key(device), layer_data_map)
-        ->device_dispatch_table->DestroyImageView(device, imageView, pAllocator);
+    layer_data *dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
+    bool skip = false;
+    std::unique_lock<std::mutex> lock(global_lock);
+    auto view_state = getImageViewState(dev_data, imageView);
+    if (view_state) {
+        VK_OBJECT obj_struct = {reinterpret_cast<uint64_t &>(imageView), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT};
+        skip |= ValidateObjectNotInUse(dev_data, view_state, obj_struct);
+        // Any bound cmd buffers are now invalid
+        invalidateCommandBuffers(view_state->cb_bindings, obj_struct);
+    }
+    if (!skip) {
+        dev_data->imageViewMap.erase(imageView);
+        lock.unlock();
+        dev_data->device_dispatch_table->DestroyImageView(device, imageView, pAllocator);
+    }
 }
 
 VKAPI_ATTR void VKAPI_CALL