diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-30 17:46:38 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:43:52 -0800 |
| commit | 17486b86644688c4f295d189b354a6ea1d6a1471 (patch) | |
| tree | 9a79b020340eb54543b4b4d1c32347d696a8269e /src | |
| parent | f5ba1f994a3cf59ad942d09f689d8d0aab79b330 (diff) | |
vk/0.210.0: More fun with flags fields
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/anv_batch_chain.c | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_cmd_buffer.c | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_dump.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_private.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/vulkan/anv_batch_chain.c b/src/vulkan/anv_batch_chain.c index 62189afec2f..34d7268631d 100644 --- a/src/vulkan/anv_batch_chain.c +++ b/src/vulkan/anv_batch_chain.c @@ -667,8 +667,8 @@ anv_cmd_buffer_end_batch_buffer(struct anv_cmd_buffer *cmd_buffer) * probably better of simply copying it into our batch. */ cmd_buffer->exec_mode = ANV_CMD_BUFFER_EXEC_MODE_EMIT; - } else if (cmd_buffer->opt_flags & - VK_CMD_BUFFER_OPTIMIZE_NO_SIMULTANEOUS_USE_BIT) { + } else if (!(cmd_buffer->usage_flags & + VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT)) { cmd_buffer->exec_mode = ANV_CMD_BUFFER_EXEC_MODE_CHAIN; /* When we chain, we need to add an MI_BATCH_BUFFER_START command diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c index 7c00f9d46ba..adba2072c51 100644 --- a/src/vulkan/anv_cmd_buffer.c +++ b/src/vulkan/anv_cmd_buffer.c @@ -188,7 +188,7 @@ VkResult anv_CreateCommandBuffer( &device->dynamic_state_block_pool); cmd_buffer->level = pCreateInfo->level; - cmd_buffer->opt_flags = 0; + cmd_buffer->usage_flags = 0; anv_cmd_state_init(&cmd_buffer->state); @@ -265,7 +265,7 @@ VkResult anv_BeginCommandBuffer( anv_cmd_buffer_reset_batch_bo_chain(cmd_buffer); - cmd_buffer->opt_flags = pBeginInfo->flags; + cmd_buffer->usage_flags = pBeginInfo->flags; if (cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY) { cmd_buffer->state.framebuffer = diff --git a/src/vulkan/anv_dump.c b/src/vulkan/anv_dump.c index 6192361e491..b2d0b385d0a 100644 --- a/src/vulkan/anv_dump.c +++ b/src/vulkan/anv_dump.c @@ -94,7 +94,7 @@ anv_dump_image_to_ppm(struct anv_device *device, result = anv_BeginCommandBuffer(cmd, &(VkCommandBufferBeginInfo) { .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, - .flags = VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT, + .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, }); assert(result == VK_SUCCESS); diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h index c86003f5823..6130cb97b75 100644 --- a/src/vulkan/anv_private.h +++ b/src/vulkan/anv_private.h @@ -1044,7 +1044,7 @@ struct anv_cmd_buffer { struct anv_state_stream surface_state_stream; struct anv_state_stream dynamic_state_stream; - VkCommandBufferOptimizeFlags opt_flags; + VkCommandBufferUsageFlags usage_flags; VkCommandBufferLevel level; struct anv_cmd_state state; |