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

Revert this accidentally committed testing change.

Fixes: 872c4bcd27 ("turnip: implement z-scaling and z-mirroring BlitImage")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8707>
(cherry picked from commit bdaa4d1ee0)
This commit is contained in:
Jonathan Marek 2021-01-25 22:06:26 -05:00 committed by Dylan Baker
parent 9cab7e3988
commit e2a27c1438
2 changed files with 2 additions and 2 deletions

View file

@ -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"
},

View file

@ -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;