diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-11-21 12:42:45 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2018-02-20 13:49:24 -0800 |
| commit | 6fb9d6c6f5510a9fb594892228fabb831be1d34c (patch) | |
| tree | 54e7084bfcd6cca78808e0c6f3d9ad2445bd62c9 | |
| parent | 01223b8199127c265c6a75b70f75d042decc1169 (diff) | |
anv/cmd_buffer: Pass a subpass id into begin_subpass
This is a bit less awkward than passing in the subpass because it means
we don't have to extract the subpass id from the subpass.
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
| -rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 59945695fd..743662dff7 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3448,13 +3448,11 @@ cmd_buffer_subpass_sync_fast_clear_values(struct anv_cmd_buffer *cmd_buffer) } } - static void cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer, - struct anv_subpass *subpass) + uint32_t subpass_id) { - cmd_buffer->state.subpass = subpass; - uint32_t subpass_id = anv_get_subpass_id(&cmd_buffer->state); + cmd_buffer->state.subpass = &cmd_buffer->state.pass->subpasses[subpass_id]; cmd_buffer->state.gfx.dirty |= ANV_CMD_DIRTY_RENDER_TARGETS; @@ -3545,7 +3543,7 @@ void genX(CmdBeginRenderPass)( genX(flush_pipeline_select_3d)(cmd_buffer); - cmd_buffer_begin_subpass(cmd_buffer, pass->subpasses); + cmd_buffer_begin_subpass(cmd_buffer, 0); } void genX(CmdNextSubpass)( @@ -3559,9 +3557,9 @@ void genX(CmdNextSubpass)( assert(cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY); + uint32_t prev_subpass = anv_get_subpass_id(&cmd_buffer->state); cmd_buffer_end_subpass(cmd_buffer); - - cmd_buffer_begin_subpass(cmd_buffer, cmd_buffer->state.subpass + 1); + cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1); } void genX(CmdEndRenderPass)( |