panvk: Move check for fragment requirement up to the draw

As the panvk_cmd_alloc_fb_desc function might be called outside a draw,
without a pipeline having been bound to the command buffer.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12019>
This commit is contained in:
Tomeu Vizoso 2021-07-23 13:05:41 +02:00
parent cef56d5824
commit 7a0acc35af
1 changed files with 3 additions and 4 deletions

View File

@ -911,9 +911,6 @@ panvk_CmdNextSubpass(VkCommandBuffer cmd, VkSubpassContents contents)
static void
panvk_cmd_alloc_fb_desc(struct panvk_cmd_buffer *cmdbuf)
{
if (!cmdbuf->state.pipeline->fs.required)
return;
struct panvk_batch *batch = cmdbuf->state.batch;
if (batch->fb.desc.gpu)
@ -1352,7 +1349,9 @@ panvk_CmdDraw(VkCommandBuffer commandBuffer,
batch = cmdbuf->state.batch;
}
panvk_cmd_alloc_fb_desc(cmdbuf);
if (cmdbuf->state.pipeline->fs.required)
panvk_cmd_alloc_fb_desc(cmdbuf);
panvk_cmd_alloc_tls_desc(cmdbuf);
panvk_cmd_prepare_ubos(cmdbuf);
panvk_cmd_prepare_textures(cmdbuf);