From: Jonathan Marek <jonathan@marek.ca>
Date: Thu, 20 Feb 2020 02:14:35 +0000 (-0500)
Subject: etnaviv: disable INT_FILTER for ASTC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1046d73af11c5a90a9d207e4554af8f1ffad62d5;p=mesa.git

etnaviv: disable INT_FILTER for ASTC

Tested on GC3000: INT_FILTER bit is incompatible with ASTC formats.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3927>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3927>
---

diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c b/src/gallium/drivers/etnaviv/etnaviv_format.c
index 1e1486de8c0..c6611971d2d 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_format.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_format.c
@@ -288,6 +288,9 @@ texture_use_int_filter(const struct pipe_sampler_view *so, bool tex_desc)
    if (util_format_is_srgb(so->format))
       return false;
 
+   if (util_format_description(so->format)->layout == UTIL_FORMAT_LAYOUT_ASTC)
+      return false;
+
    switch (so->format) {
    /* apparently D16 can't use int filter but D24 can */
    case PIPE_FORMAT_Z16_UNORM: