diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-11-11 10:18:12 +0800 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-11-11 08:59:17 -0700 |
| commit | 4ac4a8b0926393263fa94061adabfe035760072c (patch) | |
| tree | 4cd52bd56855803d2b75b2713f3ddd612c8257bb | |
| parent | ee9e207acd88d48312bbf62bf6ac1551ac8f9d90 (diff) | |
| download | usermoji-4ac4a8b0926393263fa94061adabfe035760072c.tar.xz | |
bug 15089: Does "Across Command Buffer Boundaries" apply to second-level command buffers?
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15089
| -rw-r--r-- | demos/cube.c | 6 | ||||
| -rw-r--r-- | demos/tri.c | 6 | ||||
| -rw-r--r-- | include/vulkan/vulkan.h | 13 |
3 files changed, 20 insertions, 5 deletions
diff --git a/demos/cube.c b/demos/cube.c index 318101cc..a4e99431 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -489,6 +489,9 @@ static void demo_set_image_layout( .renderPass = VK_NULL_HANDLE, .subpass = 0, .framebuffer = VK_NULL_HANDLE, + .occlusionQueryEnable = VK_FALSE, + .queryFlags = 0, + .pipelineStatistics = 0, }; err = vkBeginCommandBuffer(demo->cmd, &cmd_buf_info); assert(!err); @@ -540,6 +543,9 @@ static void demo_draw_build_cmd(struct demo *demo, VkCommandBuffer cmd_buf) .renderPass = VK_NULL_HANDLE, .subpass = 0, .framebuffer = VK_NULL_HANDLE, + .occlusionQueryEnable = VK_FALSE, + .queryFlags = 0, + .pipelineStatistics = 0, }; const VkClearValue clear_values[2] = { [0] = { .color.float32 = { 0.2f, 0.2f, 0.2f, 0.2f } }, diff --git a/demos/tri.c b/demos/tri.c index 01adb9f1..c632aae3 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -333,6 +333,9 @@ static void demo_set_image_layout( .renderPass = VK_NULL_HANDLE, .subpass = 0, .framebuffer = VK_NULL_HANDLE, + .occlusionQueryEnable = VK_FALSE, + .queryFlags = 0, + .pipelineStatistics = 0, }; err = vkBeginCommandBuffer(demo->setup_cmd, &cmd_buf_info); assert(!err); @@ -376,6 +379,9 @@ static void demo_draw_build_cmd(struct demo *demo) .renderPass = VK_NULL_HANDLE, .subpass = 0, .framebuffer = VK_NULL_HANDLE, + .occlusionQueryEnable = VK_FALSE, + .queryFlags = 0, + .pipelineStatistics = 0, }; const VkClearValue clear_values[2] = { [0] = { .color.float32 = { 0.2f, 0.2f, 0.2f, 0.2f } }, diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index ba8bc49a..b37caeb3 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1039,6 +1039,11 @@ typedef enum VkCommandBufferUsageFlagBits { } VkCommandBufferUsageFlagBits; typedef VkFlags VkCommandBufferUsageFlags; +typedef enum VkQueryControlFlagBits { + VK_QUERY_CONTROL_PRECISE_BIT = 0x00000001, +} VkQueryControlFlagBits; +typedef VkFlags VkQueryControlFlags; + typedef enum VkCommandBufferResetFlagBits { VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001, } VkCommandBufferResetFlagBits; @@ -1052,11 +1057,6 @@ typedef enum VkStencilFaceFlagBits { } VkStencilFaceFlagBits; typedef VkFlags VkStencilFaceFlags; -typedef enum VkQueryControlFlagBits { - VK_QUERY_CONTROL_PRECISE_BIT = 0x00000001, -} VkQueryControlFlagBits; -typedef VkFlags VkQueryControlFlags; - typedef void* (VKAPI_PTR *PFN_vkAllocationFunction)( void* pUserData, size_t size, @@ -2010,6 +2010,9 @@ typedef struct VkCommandBufferBeginInfo { VkRenderPass renderPass; uint32_t subpass; VkFramebuffer framebuffer; + VkBool32 occlusionQueryEnable; + VkQueryControlFlags queryFlags; + VkQueryPipelineStatisticFlags pipelineStatistics; } VkCommandBufferBeginInfo; typedef struct VkBufferCopy { |