commit 44c757d9a4d97c211a8d52f591e65bb46e745cb2
author Tobin Ehlis <tobin@lunarg.com> Fri Jul 10 12:15:19 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:17 2015 -0600
tree 49153240ee3abe08469c87532e80f5f6c36f831d
parent c278df83ca4958fda8efcf3b52e2f89c8ccd8991

layers: Updated DrawState to use new VkAttachmentView object

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index cab178b..d304331 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1531,26 +1531,16 @@
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkCreateColorAttachmentView(VkDevice device, const VkColorAttachmentViewCreateInfo* pCreateInfo, VkColorAttachmentView* pView)
+VkResult VKAPI vkCreateAttachmentView(
+    VkDevice                                    device,
+    const VkAttachmentViewCreateInfo*           pCreateInfo,
+    VkAttachmentView*                           pView)
 {
-    VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateColorAttachmentView(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.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 result = get_dispatch_table(draw_state_device_table_map, device)->CreateDepthStencilView(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 @@
         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"))