From: Gert Wollny <gert.wollny@collabora.com>
Date: Mon, 11 May 2020 07:03:41 +0000 (+0200)
Subject: r600: Fix nir compiler options, i.e. don't lower IO to temps for TESS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50eabb7035fe361d870f504b73c15962ddf0b67e;p=mesa.git

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@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4982>
---

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,
 };