Mesa (staging/20.1): r600: Fix nir compiler options, i.e. don't lower IO to temps for TESS

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 464bbd6aaafb0a6a809d00ea60818119a16e5144
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=464bbd6aaafb0a6a809d00ea60818119a16e5144

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon May 11 09:03:41 2020 +0200

r600: Fix nir compiler options, i.e. don't lower IO to temps for TESS

Also fix alignments and add umad24 and umul24 options.

Fixes: 6747a984f59ea9a2dd74b98d59cb8fdb028969ae
    r600: Enable tesselation for NIR

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

---

 .pick_status.json                           |  2 +-
 src/gallium/drivers/r600/r600_pipe_common.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c8ac22c1635..3eec1ba7755 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -580,7 +580,7 @@
         "description": "r600: Fix nir compiler options, i.e. don't lower IO to temps for TESS",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "6747a984f59ea9a2dd74b98d59cb8fdb028969ae"
     },
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index bafe8241e7a..d242389a2d4 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -1194,8 +1194,10 @@ const struct nir_shader_compiler_options r600_nir_fs_options = {
 	.lower_extract_byte = true,
 	.lower_extract_word = true,
 	.max_unroll_iterations = 32,
-        .lower_all_io_to_temps = true,
-	.vectorize_io = true
+	.lower_all_io_to_temps = true,
+	.vectorize_io = true,
+	.has_umad24 = true,
+	.has_umul24 = true,
 };
 
 const struct nir_shader_compiler_options r600_nir_options = {
@@ -1212,10 +1214,9 @@ const struct nir_shader_compiler_options r600_nir_options = {
 	.lower_extract_byte = true,
 	.lower_extract_word = true,
 	.max_unroll_iterations = 32,
-	.lower_all_io_to_temps = true,
 	.vectorize_io = true,
-        .has_umad24 = true,
-        .has_umul24 = true,
+	.has_umad24 = true,
+	.has_umul24 = true,
 };