Mesa (master): r600: Enable sb also for NIR

[GitLab Mirror]

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

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon Jan 18 13:03:57 2021 +0100

r600: Enable sb also for NIR

Currently, r600/nir doens't have a proper scheduler or optimizer backend,
to be able to make use of this code path without performance regressions,
we enable the sb optimizer also for NIR.

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8563>

---

 src/gallium/drivers/r600/r600_shader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index cfada0a8f11..54235937a4a 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -179,8 +179,8 @@ int r600_pipe_shader_create(struct pipe_context *ctx,
 		pipe_shader_type_from_mesa(sel->nir->info.stage);
 	
 	bool dump = r600_can_dump_shader(&rctx->screen->b, processor);
-	unsigned use_sb = !(rctx->screen->b.debug_flags & DBG_NO_SB) &&
-		!(rscreen->b.debug_flags & DBG_NIR);
+	unsigned use_sb = !(rctx->screen->b.debug_flags & DBG_NO_SB) /*&&
+		!(rscreen->b.debug_flags & DBG_NIR)*/;
 	unsigned sb_disasm;
 	unsigned export_shader;