From cec5bf60407ddb1a0caa8ac8cbbcb1b389e741f6 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 20 Apr 2023 11:57:31 -0700 Subject: [PATCH] freedreno/a6xx: Fix valid_format_cast logic for newer a6xx Fixes a pile of dEQP-GLES31.functional.copy_image.non_compressed.viewclass_32_bits.* on a6xx gen2 and later. Fixes: 87978c39334 ("freedreno/a6xx: Allow z24s8 format casts") Signed-off-by: Rob Clark Part-of: (cherry picked from commit b83af7e5b8114cd474ba70488f81871e44b460ad) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_resource.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0657192dfe6..3e0b1588478 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -472,7 +472,7 @@ "description": "freedreno/a6xx: Fix valid_format_cast logic for newer a6xx", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "87978c39334045b6e998e62f7353c4c98e588f53" }, diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc index a1befce7b35..5e0a64d105e 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc @@ -143,7 +143,7 @@ valid_format_cast(struct fd_resource *rsc, enum pipe_format format) * permutations of z24s8: */ if (fd_screen(rsc->b.b.screen)->info->a6xx.has_z24uint_s8uint && - (is_z24s8(format) == is_z24s8(rsc->b.b.format))) + is_z24s8(format) && is_z24s8(rsc->b.b.format)) return true; /* For some color values (just "solid white") compression metadata maps to