From 97938dac36e2875001ba24a7968e4cd8e2271321 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 26 Jan 2018 16:22:27 -0800 Subject: [PATCH] anv/cmd_buffer: Re-emit the pipeline at every subpass If we ever hit this edge-case, it can theoretically cause problem for CNL because we could end up changing render targets without re-emitting 3DSTATE_MULTISAMPLE which is part of the pipeline. Just get rid of the edge case. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Iago Toral Quiroga --- src/intel/vulkan/genX_cmd_buffer.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index fc1b6ffe0f5..9ad1b30bf92 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3204,6 +3204,17 @@ genX(cmd_buffer_set_subpass)(struct anv_cmd_buffer *cmd_buffer, if (GEN_GEN == 7) cmd_buffer->state.gfx.vb_dirty |= ~0; + /* It is possible to start a render pass with an old pipeline. Because the + * render pass and subpass index are both baked into the pipeline, this is + * highly unlikely. In order to do so, it requires that you have a render + * pass with a single subpass and that you use that render pass twice + * back-to-back and use the same pipeline at the start of the second render + * pass as at the end of the first. In order to avoid unpredictable issues + * with this edge case, we just dirty the pipeline at the start of every + * subpass. + */ + cmd_buffer->state.gfx.dirty |= ANV_CMD_DIRTY_PIPELINE; + /* Perform transitions to the subpass layout before any writes have * occurred. */ -- 2.30.2