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.
---
 icd/nulldrv/nulldrv.c | 34 ++++++++++++++++------------------
 icd/nulldrv/nulldrv.h |  5 ++---
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'icd')

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index e00c8a35..e94b7676 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -521,20 +521,19 @@ static VkResult nulldrv_desc_layout_create(struct nulldrv_dev *dev,
     return VK_SUCCESS;
 }
 
-static VkResult nulldrv_desc_layout_chain_create(struct nulldrv_dev *dev,
-                                    uint32_t setLayoutArrayCount,
-                                    const VkDescriptorSetLayout *pSetLayoutArray,
-                                    struct nulldrv_desc_layout_chain **chain_ret)
+static VkResult nulldrv_pipeline_layout_create(struct nulldrv_dev *dev,
+                                    const VkPipelineLayoutCreateInfo* pCreateInfo,
+                                    struct nulldrv_pipeline_layout **pipeline_layout_ret)
 {
-    struct nulldrv_desc_layout_chain *chain;
+    struct nulldrv_pipeline_layout *pipeline_layout;
 
-    chain = (struct nulldrv_desc_layout_chain *)
-        nulldrv_base_create(dev, sizeof(*chain),
-                VK_DBG_OBJECT_DESCRIPTOR_SET_LAYOUT_CHAIN);
-    if (!chain)
+    pipeline_layout = (struct nulldrv_pipeline_layout *)
+        nulldrv_base_create(dev, sizeof(*pipeline_layout),
+                VK_DBG_OBJECT_PIPELINE_LAYOUT);
+    if (!pipeline_layout)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-    *chain_ret = chain;
+    *pipeline_layout_ret = pipeline_layout;
 
     return VK_SUCCESS;
 }
@@ -1966,18 +1965,17 @@ ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(
             (struct nulldrv_desc_layout **) pSetLayout);
 }
 
-ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayoutChain(
-    VkDevice                                   device,
-    uint32_t                                     setLayoutArrayCount,
-    const VkDescriptorSetLayout*             pSetLayoutArray,
-    VkDescriptorSetLayoutChain*             pLayoutChain)
+ICD_EXPORT VkResult VKAPI  vkCreatePipelineLayout(
+    VkDevice                                device,
+    const VkPipelineLayoutCreateInfo*       pCreateInfo,
+    VkPipelineLayout*                       pPipelineLayout)
 {
     NULLDRV_LOG_FUNC;
     struct nulldrv_dev *dev = nulldrv_dev(device);
 
-    return nulldrv_desc_layout_chain_create(dev,
-            setLayoutArrayCount, pSetLayoutArray,
-            (struct nulldrv_desc_layout_chain **) pLayoutChain);
+    return nulldrv_pipeline_layout_create(dev,
+            pCreateInfo,
+            (struct nulldrv_pipeline_layout **) pPipelineLayout);
 }
 
 ICD_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(
diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h
index 6f9895b4..06147dd0 100644
--- a/icd/nulldrv/nulldrv.h
+++ b/icd/nulldrv/nulldrv.h
@@ -23,7 +23,7 @@
  */
 
 #ifndef NULLDRV_H
-#define NULLDRV_H 
+#define NULLDRV_H
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -142,7 +142,7 @@ struct nulldrv_desc_layout {
     struct nulldrv_obj obj;
 };
 
-struct nulldrv_desc_layout_chain {
+struct nulldrv_pipeline_layout {
     struct nulldrv_obj obj;
 };
 
@@ -151,7 +151,6 @@ struct nulldrv_shader {
 
 };
 
-
 struct nulldrv_pipeline {
     struct nulldrv_obj obj;
     struct nulldrv_dev *dev;
-- 
cgit v1.2.3