Mesa (main): freedreno/a6xx: Drop texturing support from other scaled formats.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4b36e7b1b5519b5bcecfd6f4ff3bb96e94171c9f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b36e7b1b5519b5bcecfd6f4ff3bb96e94171c9f

Author: Emma Anholt <emma at anholt.net>
Date:   Fri Sep 24 15:32:23 2021 -0700

freedreno/a6xx: Drop texturing support from other scaled formats.

GLES doesn't expose these texture formats, and we don't want to start
exposing them when turnip starts using our tables.

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

---

 src/freedreno/fdl/fd6_format_table.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/freedreno/fdl/fd6_format_table.c b/src/freedreno/fdl/fd6_format_table.c
index f7685ec2083..157fd59af71 100644
--- a/src/freedreno/fdl/fd6_format_table.c
+++ b/src/freedreno/fdl/fd6_format_table.c
@@ -149,8 +149,8 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
    VTC(R16G16_SNORM,   16_16_SNORM,             WZYX),
    VTC(R16G16_UINT,    16_16_UINT,              WZYX),
    VTC(R16G16_SINT,    16_16_SINT,              WZYX),
-   VT_(R16G16_USCALED, 16_16_UINT,              WZYX),
-   VT_(R16G16_SSCALED, 16_16_SINT,              WZYX),
+   V__(R16G16_USCALED, 16_16_UINT,              WZYX),
+   V__(R16G16_SSCALED, 16_16_SINT,              WZYX),
    VTC(R16G16_FLOAT,   16_16_FLOAT,             WZYX),
 
    _T_(L16A16_UNORM,   16_16_UNORM,             WZYX),
@@ -233,8 +233,8 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
    VTC(R16G16B16X16_UINT,    16_16_16_16_UINT,  WZYX),
    VTC(R16G16B16A16_SINT,    16_16_16_16_SINT,  WZYX),
    VTC(R16G16B16X16_SINT,    16_16_16_16_SINT,  WZYX),
-   VT_(R16G16B16A16_USCALED, 16_16_16_16_UINT,  WZYX),
-   VT_(R16G16B16A16_SSCALED, 16_16_16_16_SINT,  WZYX),
+   V__(R16G16B16A16_USCALED, 16_16_16_16_UINT,  WZYX),
+   V__(R16G16B16A16_SSCALED, 16_16_16_16_SINT,  WZYX),
    VTC(R16G16B16A16_FLOAT,   16_16_16_16_FLOAT, WZYX),
    VTC(R16G16B16X16_FLOAT,   16_16_16_16_FLOAT, WZYX),