v3dv: fix subpass merge tests
authorIago Toral Quiroga <itoral@igalia.com>
Tue, 14 Apr 2020 09:35:46 +0000 (11:35 +0200)
committerMarge Bot <eric+marge@anholt.net>
Tue, 13 Oct 2020 21:21:29 +0000 (21:21 +0000)
commit781dd7ff31af62201a64e8977bbc63a48acd482b
tree2f5c4b18a733abca32b479fad231c0642a7460ad
parentb94946c23bab2cfceaf3101cb10f8e517a359122
v3dv: fix subpass merge tests

When testing if we could merge the new subpass into the previous one
We were taking the subpass index from the state (which isn't updated
to the new subpass until a bit later when the job for the new subpass
has been settled). This means that we were doing the merge checks with
the previous subpass, not the current one.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
src/broadcom/vulkan/v3dv_cmd_buffer.c