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: 6747a984f5
    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>
(cherry picked from commit 50eabb7035)
This commit is contained in:
Gert Wollny 2020-05-11 09:03:41 +02:00 committed by Eric Engestrom
parent 5c0738f967
commit 464bbd6aaa
2 changed files with 7 additions and 6 deletions

View file

@ -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"
},

View file

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