From a74c5b2357946c7f48dd04852c3fbf1bda0837d1 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 7 Jul 2015 11:50:03 +0800 Subject: 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 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'vulkan.py') diff --git a/vulkan.py b/vulkan.py index 2415f3ba..123fccf4 100755 --- a/vulkan.py +++ b/vulkan.py @@ -194,8 +194,7 @@ core = Extension( "VkBufferView", "VkImage", "VkImageView", - "VkColorAttachmentView", - "VkDepthStencilView", + "VkAttachmentView", "VkShader", "VkPipeline", "VkPipelineCache", @@ -493,15 +492,10 @@ core = Extension( 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 @@ core = Extension( 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 @@ object_list = [ "VkBufferView", "VkImage", "VkImageView", - "VkColorAttachmentView", - "VkDepthStencilView", + "VkAttachmentView", "VkShader", "VkPipeline", "VkPipelineCache", -- cgit v1.2.3