From 1cfc77227fd92392bf16e5aa359edbc18ef3547b Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Fri, 17 Apr 2015 14:11:39 -0500
Subject: vulkan: Update vulkan.h for revision 89 -- Bug #13743

Generalizing the VkDescriptorSetLayoutChain object.
---
 layers/draw_state.cpp    | 10 +++++-----
 layers/object_track.h    |  6 +++---
 layers/param_checker.cpp |  5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'layers')

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index ab49bce8..852eb915 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1684,11 +1684,11 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, cons
     return result;
 }
 
-VkResult VKAPI vkCreateDescriptorSetLayoutChain(VkDevice device, uint32_t setLayoutArrayCount, const VkDescriptorSetLayout* pSetLayoutArray, VkDescriptorSetLayoutChain* pLayoutChain)
+VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout)
 {
-    VkResult result = nextTable.CreateDescriptorSetLayoutChain(device, setLayoutArrayCount, pSetLayoutArray, pLayoutChain);
+    VkResult result = nextTable.CreatePipelineLayout(device, pCreateInfo, pPipelineLayout);
     if (VK_SUCCESS == result) {
-        // TODO : Need to capture the layout chains
+        // TODO : Need to capture the pipeline layout
     }
     return result;
 }
@@ -2759,8 +2759,8 @@ VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalDevice gpu, const char* func
         return (void*) vkCreateSampler;
     if (!strcmp(funcName, "vkCreateDescriptorSetLayout"))
         return (void*) vkCreateDescriptorSetLayout;
-    if (!strcmp(funcName, "vkCreateDescriptorSetLayoutChain"))
-        return (void*) vkCreateDescriptorSetLayoutChain;
+    if (!strcmp(funcName, "vkCreatePipelineLayout"))
+        return (void*) vkCreatePipelineLayout;
     if (!strcmp(funcName, "vkBeginDescriptorPoolUpdate"))
         return (void*) vkBeginDescriptorPoolUpdate;
     if (!strcmp(funcName, "vkEndDescriptorPoolUpdate"))
diff --git a/layers/object_track.h b/layers/object_track.h
index 11dbedaf..64e95b00 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -67,7 +67,7 @@ typedef enum _VK_OBJECT_TYPE
     VkObjectTypeSemaphore,
     VkObjectTypeShader,
     VkObjectTypeDescriptorSetLayout,
-    VkObjectTypeDescriptorSetLayoutChain,
+    VkObjectTypePipelineLayout,
     VkObjectTypeBuffer,
     VkObjectTypePipeline,
     VkObjectTypeDevice,
@@ -105,10 +105,10 @@ static const char* string_VK_OBJECT_TYPE(VK_OBJECT_TYPE type) {
             return "FENCE";
         case VkObjectTypeDescriptorSetLayout:
             return "DESCRIPTOR_SET_LAYOUT";
-        case VkObjectTypeDescriptorSetLayoutChain:
-            return "DESCRIPTOR_SET_LAYOUT_CHAIN";
         case VkObjectTypeDeviceMemory:
             return "DEVICE_MEMORY";
+        case VkObjectTypePipelineLayout:
+            return "PIPELINE_LAYOUT";
         case VkObjectTypeQueue:
             return "QUEUE";
         case VkObjectTypeImage:
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index cbb341a8..e3058a5d 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -985,10 +985,9 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, cons
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayoutChain(VkDevice device, uint32_t setLayoutArrayCount, const VkDescriptorSetLayout* pSetLayoutArray, VkDescriptorSetLayoutChain* pLayoutChain)
+VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout)
 {
-
-    VkResult result = nextTable.CreateDescriptorSetLayoutChain(device, setLayoutArrayCount, pSetLayoutArray, pLayoutChain);
+    VkResult result = nextTable.CreatePipelineLayout(device, pCreateInfo, pPipelineLayout);
     return result;
 }
 
-- 
cgit v1.2.3