layers: Updated DrawState to use new VkAttachmentView object

3 files changed, 10 insertions, 25 deletions

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 958387d5..8fc23d6c 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -135,9 +135,7 @@ endif()
 
 add_vk_layer(Basic basic.cpp vk_layer_table.cpp)
 add_vk_layer(Multi multi.cpp)
-# TODO: Port DrawState to use VkAttachmentView structure as
-# defined in bug 14075: tiling across render passes
-#add_vk_layer(DrawState draw_state.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
+add_vk_layer(DrawState draw_state.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
 add_vk_layer(MemTracker mem_tracker.cpp vk_layer_table.cpp)
 add_vk_layer(ShaderChecker shader_checker.cpp vk_layer_table.cpp)
 add_vk_layer(Image image.cpp vk_layer_table.cpp)
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index cab178b9..d304331e 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1531,26 +1531,16 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageV
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkCreateColorAttachmentView(VkDevice device, const VkColorAttachmentViewCreateInfo* pCreateInfo, VkColorAttachmentView* pView)
-{
-    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateColorAttachmentView(device, pCreateInfo, pView);
-    if (VK_SUCCESS == result) {
-        loader_platform_thread_lock_mutex(&globalLock);
-        IMAGE_NODE *pNewNode = new IMAGE_NODE;
-        pNewNode->createInfo.cvci = *pCreateInfo;
-        viewCreateInfoMap[*pView] = pNewNode;
-        loader_platform_thread_unlock_mutex(&globalLock);
-    }
-    return result;
-}
-
-VK_LAYER_EXPORT VkResult VKAPI vkCreateDepthStencilView(VkDevice device, const VkDepthStencilViewCreateInfo* pCreateInfo, VkDepthStencilView* pView)
+VkResult VKAPI vkCreateAttachmentView(
+    VkDevice                                    device,
+    const VkAttachmentViewCreateInfo*           pCreateInfo,
+    VkAttachmentView*                           pView)
 {
-    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateDepthStencilView(device, pCreateInfo, pView);
+    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateAttachmentView(device, pCreateInfo, pView);
     if (VK_SUCCESS == result) {
         loader_platform_thread_lock_mutex(&globalLock);
         IMAGE_NODE *pNewNode = new IMAGE_NODE;
-        pNewNode->createInfo.dsvci = *pCreateInfo;
+        pNewNode->createInfo.avci = *pCreateInfo;
         viewCreateInfoMap[*pView] = pNewNode;
         loader_platform_thread_unlock_mutex(&globalLock);
     }
@@ -2787,10 +2777,8 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice dev, const char* funcNa
         return (void*) vkCreateBufferView;
     if (!strcmp(funcName, "vkCreateImageView"))
         return (void*) vkCreateImageView;
-    if (!strcmp(funcName, "vkCreateColorAttachmentView"))
-        return (void*) vkCreateColorAttachmentView;
-    if (!strcmp(funcName, "vkCreateDepthStencilView"))
-        return (void*) vkCreateDepthStencilView;
+    if (!strcmp(funcName, "vkCreateAttachmentView"))
+        return (void*) vkCreateAttachmentView;
     if (!strcmp(funcName, "CreatePipelineCache"))
         return (void*) vkCreatePipelineCache;
     if (!strcmp(funcName, "DestroyPipelineCache"))
diff --git a/layers/draw_state.h b/layers/draw_state.h
index dcebaa2e..f50140ee 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -122,8 +122,7 @@ typedef struct _SAMPLER_NODE {
 typedef struct _IMAGE_NODE {
     union {
         VkImageViewCreateInfo ivci;
-        VkAttachmentViewCreateInfo cvci;
-        VkAttachmentViewCreateInfo dsvci;
+        VkAttachmentViewCreateInfo avci;
     } createInfo;
 } IMAGE_NODE;