commit c278df83ca4958fda8efcf3b52e2f89c8ccd8991
author Chia-I Wu <olv@lunarg.com> Tue Jul 07 11:50:03 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:17 2015 -0600
tree 35d20b066d5eaec66fb9ae5f952dcc0d9b08de92
parent bdeed1546150c8b0584710c77a8c6e62936f21fe

update vulkan.h for multi-pass command buffers (V131, #14075)

Minimal changes to keep everything building and functioning.

TODO: Need to port draw_state to use new VkAttachmentView structure.

icd/nulldrv/nulldrv.c

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 32b8f5f..6e4ea00 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -236,13 +236,13 @@
 }
 
 static VkResult nulldrv_rt_view_create(struct nulldrv_dev *dev,
-                                const VkColorAttachmentViewCreateInfo *info,
+                                const VkAttachmentViewCreateInfo *info,
                                 struct nulldrv_rt_view **view_ret)
 {
     struct nulldrv_rt_view *view;
 
     view = (struct nulldrv_rt_view *) nulldrv_base_create(dev, sizeof(*view),
-            VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW);
+            VK_OBJECT_TYPE_ATTACHMENT_VIEW);
     if (!view)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
@@ -344,27 +344,6 @@
     return VK_SUCCESS;
 }
 
-static VkResult nulldrv_ds_view_create(struct nulldrv_dev *dev,
-                                const VkDepthStencilViewCreateInfo *info,
-                                struct nulldrv_ds_view **view_ret)
-{
-    struct nulldrv_img *img = nulldrv_img(info->image);
-    struct nulldrv_ds_view *view;
-
-    view = (struct nulldrv_ds_view *) nulldrv_base_create(dev, sizeof(*view),
-            VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW);
-    if (!view)
-        return VK_ERROR_OUT_OF_HOST_MEMORY;
-
-    view->img = img;
-
-    view->array_size = info->arraySize;
-
-    *view_ret = view;
-
-    return VK_SUCCESS;
-}
-
 static VkResult nulldrv_sampler_create(struct nulldrv_dev *dev,
                                 const VkSamplerCreateInfo *info,
                                 struct nulldrv_sampler **sampler_ret)
@@ -1978,10 +1957,10 @@
             (struct nulldrv_img_view **) pView);
 }
 
-ICD_EXPORT VkResult VKAPI vkCreateColorAttachmentView(
+ICD_EXPORT VkResult VKAPI vkCreateAttachmentView(
     VkDevice                                  device,
-    const VkColorAttachmentViewCreateInfo* pCreateInfo,
-    VkColorAttachmentView*                  pView)
+    const VkAttachmentViewCreateInfo* pCreateInfo,
+    VkAttachmentView*                  pView)
 {
     NULLDRV_LOG_FUNC;
     struct nulldrv_dev *dev = nulldrv_dev(device);
@@ -1990,19 +1969,6 @@
             (struct nulldrv_rt_view **) pView);
 }
 
-ICD_EXPORT VkResult VKAPI vkCreateDepthStencilView(
-    VkDevice                                  device,
-    const VkDepthStencilViewCreateInfo*   pCreateInfo,
-    VkDepthStencilView*                     pView)
-{
-    NULLDRV_LOG_FUNC;
-    struct nulldrv_dev *dev = nulldrv_dev(device);
-
-    return nulldrv_ds_view_create(dev, pCreateInfo,
-            (struct nulldrv_ds_view **) pView);
-
-}
-
 ICD_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(
     VkDevice                                   device,
     const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
@@ -2116,8 +2082,16 @@
 }
 
 ICD_EXPORT void VKAPI vkCmdBeginRenderPass(
-    VkCmdBuffer                              cmdBuffer,
-    const VkRenderPassBegin*                pRenderPassBegin)
+    VkCmdBuffer                                 cmdBuffer,
+    const VkRenderPassBeginInfo*                pRenderPassBegin,
+    VkRenderPassContents                        contents)
+{
+    NULLDRV_LOG_FUNC;
+}
+
+ICD_EXPORT void VKAPI vkCmdNextSubpass(
+    VkCmdBuffer                                 cmdBuffer,
+    VkRenderPassContents                        contents)
 {
     NULLDRV_LOG_FUNC;
 }