From: Jonathan Marek <jonathan@marek.ca>
Date: Tue, 26 Jan 2021 03:06:26 +0000 (-0500)
Subject: turnip: don't always use 3d ops for blit_image
X-Git-Tag: upstream/21.2.3~8482
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdaa4d1ee0029d13e5d76060c1fcbf95a46b1145;p=platform%2Fupstream%2Fmesa.git

turnip: don't always use 3d ops for blit_image

Revert this accidentally committed testing change.

Fixes: 872c4bcd27db ("turnip: implement z-scaling and z-mirroring BlitImage")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8707>
---

diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index 9723921..654511b 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -1060,7 +1060,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;
    bool z_scale = false;
    uint32_t layers = info->dstOffsets[1].z - info->dstOffsets[0].z;