From 51492f20f7e8fde5077f5c54165307eeb4cd1f2f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 3 Apr 2020 11:09:20 +1000
Subject: [PATCH] Revert "gallivm: disable rgtc/latc SNORM accellerated
 fetches"

This reverts commit 4897e70ccd3987d470ec8622d473ee3405f6e96f.

Fixed in previous commits.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4425>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4425>
---
 .../auxiliary/gallivm/lp_bld_format_aos.c     | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
index 781ceb8b03d..f8e1a963bb4 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format_aos.c
@@ -770,25 +770,19 @@ lp_build_fetch_rgba_aos(struct gallivm_state *gallivm,
                        format_desc->format == PIPE_FORMAT_LATC1_SNORM ||
                        format_desc->format == PIPE_FORMAT_LATC2_SNORM);
 
-      if (!tmp_type.sign) {
-         /*
-          * FIXME: this is buggy for snorm formats, likely the lerp is
-          * busted.
-          */
-         tmp = lp_build_fetch_rgtc_rgba_aos(gallivm,
-                                            format_desc,
-                                            num_pixels,
-                                            base_ptr,
-                                            offset,
-                                            i, j,
-                                            cache);
-
-         lp_build_conv(gallivm,
-                       tmp_type, type,
-                       &tmp, 1, &tmp, 1);
-
-         return tmp;
-      }
+      tmp = lp_build_fetch_rgtc_rgba_aos(gallivm,
+                                         format_desc,
+                                         num_pixels,
+                                         base_ptr,
+                                         offset,
+                                         i, j,
+                                         cache);
+
+      lp_build_conv(gallivm,
+                    tmp_type, type,
+                    &tmp, 1, &tmp, 1);
+
+       return tmp;
    }
 
    /*
-- 
2.30.2