From bd53ee624766cc5a01bd6fd1de423a300ab2f73f Mon Sep 17 00:00:00 2001
From: Iago Toral Quiroga <itoral@igalia.com>
Date: Tue, 21 Apr 2020 14:00:32 +0200
Subject: [PATCH] v3dv: reset subpass index at render pass end

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
---
 src/broadcom/vulkan/v3dv_cmd_buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index c207c532926..8a8783fc71c 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -1843,8 +1843,9 @@ v3dv_CmdEndRenderPass(VkCommandBuffer commandBuffer)
    }
 
    /* We are no longer inside a render pass */
-   state->pass = NULL;
    state->framebuffer = NULL;
+   state->pass = NULL;
+   state->subpass_idx = -1;
 }
 
 VkResult