Mesa (master): freedreno/a6xx: fix Z24_UNORM_S8_UINT_AS_R8G8B8A8

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed Feb 12 18:40:57 2020 -0500

freedreno/a6xx: fix Z24_UNORM_S8_UINT_AS_R8G8B8A8

CI didn't run so missed this.

Note previously had :
   texfmt = TFMT6_Z24_UNORM_S8_UINT
   rbfmt = RB6_Z24_UNORM_S8_UINT_AS_R8G8B8A8

which are both now FMT6_Z24_UNORM_S8_UINT_AS_R8G8B8A8

Fixes: 18786cc7d55 ("freedreno/a6xx: use single format enum")

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

---

 src/gallium/drivers/freedreno/a6xx/fd6_format.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_format.c b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
index 0c6d79b71b2..f8431354502 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_format.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
@@ -207,7 +207,7 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
 	_TC(X32_S8X24_UINT,       8_UINT,            WZYX),
 
 	/* special format for blits: */
-	_TC(Z24_UNORM_S8_UINT_AS_R8G8B8A8, Z24_UNORM_S8_UINT, WZYX),
+	_TC(Z24_UNORM_S8_UINT_AS_R8G8B8A8, Z24_UNORM_S8_UINT_AS_R8G8B8A8, WZYX),
 
 	/* 48-bit */
 	V__(R16G16B16_UNORM,   16_16_16_UNORM,       WZYX),