From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Tue, 5 May 2020 07:18:35 +0000 (-0700)
Subject: freedreno/a6xx: Set tfetch correctly for compressed formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85f2cd84ac14be7d44eb7d5deb9b9756bd7bacc2;p=mesa.git

freedreno/a6xx: Set tfetch correctly for compressed formats

The fetchsize is just the blocksize for compressed formats, which gets
rid of the ASTC special cases add handles ETC1/2 as well.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4868>
---

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_format.c b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
index 1780fbcc941..fbb1fb960a8 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_format.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
@@ -378,10 +378,7 @@ fd6_pipe2fetchsize(enum pipe_format format)
 	if (format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)
 		format = PIPE_FORMAT_Z32_FLOAT;
 
-	if (util_format_description(format)->layout == UTIL_FORMAT_LAYOUT_ASTC)
-		return TFETCH6_16_BYTE;
-
-	switch (util_format_get_blocksizebits(format) / util_format_get_blockwidth(format)) {
+	switch (util_format_get_blocksizebits(format)) {
 	case 8:   return TFETCH6_1_BYTE;
 	case 16:  return TFETCH6_2_BYTE;
 	case 32:  return TFETCH6_4_BYTE;