Mesa (staging/21.1): Revert "r600: Don't advertise support for scaled int16 vertex formats"

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: ac7b6c9dc87fe49d1897e2bd3b9334d47a178a67
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac7b6c9dc87fe49d1897e2bd3b9334d47a178a67

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Tue Apr 20 23:57:12 2021 +0200

Revert "r600: Don't advertise support for scaled int16 vertex formats"

This reverts commit 00a1521529ccb4f7527c6d55a471ef18d1b000d1.

While the commit fixed some GLES cts tests it introduced heavy regressions
that made the driver unusable.

Closes #4680

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10388>
(cherry picked from commit 0934467fd91b7c29da171902b7f0eef6baee4ca5)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/r600/r600_formats.h | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 66bf9d53102..78e1dc891cf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "Revert \"r600: Don't advertise support for scaled int16 vertex formats\"",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "00a1521529ccb4f7527c6d55a471ef18d1b000d1"
     },
diff --git a/src/gallium/drivers/r600/r600_formats.h b/src/gallium/drivers/r600/r600_formats.h
index 712b057f65a..6c94a24700b 100644
--- a/src/gallium/drivers/r600/r600_formats.h
+++ b/src/gallium/drivers/r600/r600_formats.h
@@ -119,15 +119,6 @@ static inline bool r600_is_vertex_format_supported(enum pipe_format format)
 	if (desc->channel[i].size == 8 && desc->nr_channels == 3)
 		return false;
 
-        /* No 16 bit scaled integer formats */
-        if (desc->channel[i].size == 16) {
-           if (desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED ||
-               desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
-              if (!desc->channel[i].normalized && !desc->channel[i].pure_integer)
-                 return false;
-           }
-        }
-
 	return true;
 }