commit 08accc6a0f74094176884e51f9fbdcbef7f0086a
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 d61ac05ca709858eb6260eff0ec88c3af5deefba
parent b4052048e4e3962e78c6357e6d473fff210f3a90

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.

vulkan.py

diff --git a/vulkan.py b/vulkan.py
index 2415f3b..123fccf 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -194,8 +194,7 @@
         "VkBufferView",
         "VkImage",
         "VkImageView",
-        "VkColorAttachmentView",
-        "VkDepthStencilView",
+        "VkAttachmentView",
         "VkShader",
         "VkPipeline",
         "VkPipelineCache",
@@ -493,15 +492,10 @@
              Param("const VkImageViewCreateInfo*", "pCreateInfo"),
              Param("VkImageView*", "pView")]),
 
-        Proto("VkResult", "CreateColorAttachmentView",
+        Proto("VkResult", "CreateAttachmentView",
             [Param("VkDevice", "device"),
-             Param("const VkColorAttachmentViewCreateInfo*", "pCreateInfo"),
-             Param("VkColorAttachmentView*", "pView")]),
-
-        Proto("VkResult", "CreateDepthStencilView",
-            [Param("VkDevice", "device"),
-             Param("const VkDepthStencilViewCreateInfo*", "pCreateInfo"),
-             Param("VkDepthStencilView*", "pView")]),
+             Param("const VkAttachmentViewCreateInfo*", "pCreateInfo"),
+             Param("VkAttachmentView*", "pView")]),
 
         Proto("VkResult", "CreateShaderModule",
             [Param("VkDevice", "device"),
@@ -873,7 +867,12 @@
 
         Proto("void", "CmdBeginRenderPass",
             [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("const VkRenderPassBegin*", "pRenderPassBegin")]),
+             Param("const VkRenderPassBeginInfo*", "pRenderPassBegin"),
+             Param("VkRenderPassContents", "contents")]),
+
+        Proto("void", "CmdNextSubpass",
+            [Param("VkCmdBuffer", "cmdBuffer"),
+             Param("VkRenderPassContents", "contents")]),
 
         Proto("void", "CmdEndRenderPass",
             [Param("VkCmdBuffer", "cmdBuffer")]),
@@ -942,8 +941,7 @@
     "VkBufferView",
     "VkImage",
     "VkImageView",
-    "VkColorAttachmentView",
-    "VkDepthStencilView",
+    "VkAttachmentView",
     "VkShader",
     "VkPipeline",
     "VkPipelineCache",