From: Jason Ekstrand Date: Mon, 12 Feb 2018 16:17:57 +0000 (-0800) Subject: anv: Move setting current_pipeline to cmd_state_init X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c77e21c814145e845bac64cce40eadfd7ac0bd9;p=mesa.git anv: Move setting current_pipeline to cmd_state_init We were setting current_pipeline to UINT32_MAX and then calling cmd_cmd_state_reset which memsets the entire state struct to 0 which implicitly resets current_pipeline to 3D. I have no idea how this hasn't caused everything to explode. Fixes: cd3feea74582 "anv/cmd_buffer: Rework anv_cmd_state_reset" cc: mesa-stable@lists.freedesktop.org Reviewed-by: Lionel Landwerlin --- diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 698028123c1..160ff5323df 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -119,6 +119,7 @@ anv_cmd_state_init(struct anv_cmd_buffer *cmd_buffer) memset(state, 0, sizeof(*state)); + state->current_pipeline = UINT32_MAX; state->restart_index = UINT32_MAX; state->gfx.dynamic = default_dynamic_state; } @@ -292,7 +293,6 @@ VkResult anv_cmd_buffer_reset(struct anv_cmd_buffer *cmd_buffer) { cmd_buffer->usage_flags = 0; - cmd_buffer->state.current_pipeline = UINT32_MAX; anv_cmd_buffer_reset_batch_bo_chain(cmd_buffer); anv_cmd_state_reset(cmd_buffer);