From e2a27c14387cd21ac0beb5eee0797f0bc2a2bb19 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Mon, 25 Jan 2021 22:06:26 -0500 Subject: [PATCH] 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: (cherry picked from commit bdaa4d1ee0029d13e5d76060c1fcbf95a46b1145) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_clear_blit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d33cb41eaab..c6f929b0a7d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -202,7 +202,7 @@ "description": "turnip: don't always use 3d ops for blit_image", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "872c4bcd27db7b7ca26abe9fc090ae26d502156f" }, diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 97239214beb..654511b232a 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;