From: Cody Northrop <cody@lunarg.com>
Date: Tue, 11 Aug 2015 17:35:58 +0000 (-0600)
Subject: v150: Bug 14384 - Add a subpass field to VkCmdBufferBeginInfo
X-Git-Tag: upstream/1.1.92~5041
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0a178c4545f2e2d9e3f8694f02df7363b9f4b79;p=platform%2Fupstream%2FVulkan-Tools.git

v150: Bug 14384 - Add a subpass field to VkCmdBufferBeginInfo
---

diff --git a/demos/cube.c b/demos/cube.c
index ecbdbd2..e2f2049 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -465,6 +465,9 @@ static void demo_set_image_layout(
             .pNext = NULL,
             .flags = VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT |
                 VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT,
+            .renderPass = VK_NULL_HANDLE,
+            .subpass = 0,
+            .framebuffer = VK_NULL_HANDLE,
         };
         err = vkBeginCommandBuffer(demo->cmd, &cmd_buf_info);
     }
@@ -504,6 +507,9 @@ static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf)
         .sType = VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO,
         .pNext = NULL,
         .flags = VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT,
+        .renderPass = VK_NULL_HANDLE,
+        .subpass = 0,
+        .framebuffer = VK_NULL_HANDLE,
     };
     const VkClearValue clear_values[2] = {
         [0] = { .color.f32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
diff --git a/demos/tri.c b/demos/tri.c
index 51b1c8e..9cfa48d 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -307,6 +307,9 @@ static void demo_set_image_layout(
             .pNext = NULL,
             .flags = VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT |
                 VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT,
+            .renderPass = VK_NULL_HANDLE,
+            .subpass = 0,
+            .framebuffer = VK_NULL_HANDLE,
         };
         err = vkBeginCommandBuffer(demo->setup_cmd, &cmd_buf_info);
     }
@@ -347,6 +350,9 @@ static void demo_draw_build_cmd(struct demo *demo)
         .pNext = NULL,
         .flags = VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT |
             VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT,
+        .renderPass = VK_NULL_HANDLE,
+        .subpass = 0,
+        .framebuffer = VK_NULL_HANDLE,
     };
     const VkClearValue clear_values[2] = {
         [0] = { .color.f32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
diff --git a/include/vulkan.h b/include/vulkan.h
index 6c6a9e4..d6670ce 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -41,7 +41,7 @@ extern "C" {
     ((major << 22) | (minor << 12) | patch)
 
 // Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 149, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 150, 0)
 
 
 #define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj;
@@ -1945,6 +1945,7 @@ typedef struct {
     const void*                                 pNext;
     VkCmdBufferOptimizeFlags                    flags;
     VkRenderPass                                renderPass;
+    uint32_t                                    subpass;
     VkFramebuffer                               framebuffer;
 } VkCmdBufferBeginInfo;