Mesa (master): turnip: fix 3D path always being used for CmdBlitImage

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 198b13974a203f47a93c3bc7dfc355409b9706f2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=198b13974a203f47a93c3bc7dfc355409b9706f2

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue Jun 16 19:07:41 2020 -0400

turnip: fix 3D path always being used for CmdBlitImage

This change accidentally made it into 72d7df40a5e5b50, and started causing
blit_image flakes (because of the issue fixed in the previous patch)

Fixes: 72d7df40a5e5b50 ("turnip: add layered 3D path clear for CmdClearAttachments")

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5509>

---

 src/freedreno/vulkan/tu_clear_blit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index 34591443ae5..80f993bb73f 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -1097,7 +1097,7 @@ tu6_blit_image(struct tu_cmd_buffer *cmd,
                const VkImageBlit *info,
                VkFilter filter)
 {
-   const struct blit_ops *ops = &r3d_ops;
+   const struct blit_ops *ops = &r2d_ops;
    struct tu_cs *cs = &cmd->cs;
    uint32_t layers;