From d98ff2cc4add875f2e372bf69e45b1c6a7b8a9c6 Mon Sep 17 00:00:00 2001 From: M Henning Date: Sat, 10 Feb 2024 16:52:58 -0500 Subject: [PATCH] nvk: Don't clobber vb0 after repeated blits If a program does two blits in a row, we internally do a sequence of operations that involves binding vb0. Previously, the vb0 state after each operation would look something like: | operation | cmd->state.gfx.vb0 | hardware | save->vb0 | | ---------------------------- | ------------------ | --------- | --------- | | | user | user | | | nvk_meta_begin() | user | user | user | | BindVertexBuffers(internal0) | internal0 | internal0 | user | | nvk_meta_end() | internal0 | user | | | nvk_meta_begin() | internal0 | user | internal0 | | BindVertexBuffers(internal1) | internal1 | internal1 | internal0 | | nvk_meta_end() | internal1 | internal0 | | That is, CmdBindVertexBuffers() would update cmd->state.gfx.vb0, but nvk_meta_end() would not. This meant that the last operation would bind a driver-internal buffer instead of the original value that the user set. This change fixes the issue by tracking cmd->state.gfx.vb0 in nvk_cmd_bind_vertex_buffer(), which both CmdBindVertexBuffers() and nvk_meta_end() call into. After this commit, the state looks like: | operation | cmd->state.gfx.vb0 | hardware | save->vb0 | | ---------------------------- | ------------------ | --------- | --------- | | | user | user | | | nvk_meta_begin() | user | user | user | | BindVertexBuffers(internal0) | internal0 | internal0 | user | | nvk_meta_end() | user | user | | | nvk_meta_begin() | user | user | user | | BindVertexBuffers(internal1) | internal1 | internal1 | user | | nvk_meta_end() | user | user | | To test this commit, build gtk4 commit 87b66de1, run: GSK_RENDERER=vulkan gtk4-demo --run=image_scaling then select trilinear filtering in the dropdown and check for rendering artifacts. Fixes: e1c66501 ("nvk: Use vk_meta for CmdClearAttachments") Part-of: --- src/nouveau/vulkan/nvk_cmd_draw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 90fdd50a117..48e755da606 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -2140,6 +2140,10 @@ void nvk_cmd_bind_vertex_buffer(struct nvk_cmd_buffer *cmd, uint32_t vb_idx, struct nvk_addr_range addr_range) { + /* Used for meta save/restore */ + if (vb_idx == 0) + cmd->state.gfx.vb0 = addr_range; + struct nv_push *p = nvk_cmd_buffer_push(cmd, 6); P_MTHD(p, NV9097, SET_VERTEX_STREAM_A_LOCATION_A(vb_idx)); @@ -2184,10 +2188,6 @@ nvk_CmdBindVertexBuffers2(VkCommandBuffer commandBuffer, const struct nvk_addr_range addr_range = nvk_buffer_addr_range(buffer, pOffsets[i], size); - /* Used for meta save/restore */ - if (idx == 0) - cmd->state.gfx.vb0 = addr_range; - nvk_cmd_bind_vertex_buffer(cmd, idx, addr_range); } }