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

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 50eabb7035fe361d870f504b73c15962ddf0b67e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50eabb7035fe361d870f504b73c15962ddf0b67e

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>

---

 src/gallium/drivers/r600/r600_pipe_common.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 77b70bf3f53..931f7c697b6 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -1192,8 +1192,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 = {
@@ -1210,10 +1212,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,
 };