r600/sfn; go back to not lowering uniforms to UBOs

Lowering uniforms to UBOs results in an aditional iadd for the
UBO buffer id evaluation, and for indirect buffers access that
results in an unnecessary op that can be avoided by not lowering
uniforms. There is some code duplication when reading the uniforms
but it saves a whole instruction group per indirect cont buffer
access.

This reverts commit 98eb00face with
some additional fixes.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6879>
This commit is contained in:
Gert Wollny
2020-09-26 20:14:00 +02:00
committed by Marge Bot
parent 9a6b11a733
commit 6784cea646
4 changed files with 48 additions and 8 deletions

View File

@@ -1201,7 +1201,6 @@ const struct nir_shader_compiler_options r600_nir_fs_options = {
.vectorize_io = true,
.has_umad24 = true,
.has_umul24 = true,
.lower_uniforms_to_ubo = true
};
const struct nir_shader_compiler_options r600_nir_options = {
@@ -1224,7 +1223,6 @@ const struct nir_shader_compiler_options r600_nir_options = {
.vectorize_io = true,
.has_umad24 = true,
.has_umul24 = true,
.lower_uniforms_to_ubo = true
};