From 33765aa92aa5c150873fc210e9d6c1fe22cf8646 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Thu, 28 Jul 2022 13:02:22 +0200 Subject: [PATCH] r600/sfn: Enable NIR for pre RG hardware Signed-off-by: Gert Wollny Reviewed-by: Filip Gawin Part-of: --- src/gallium/drivers/r600/r600_pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 5796835ab08..523b8b35c63 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -245,8 +245,8 @@ fail: } static bool is_nir_enabled(struct r600_common_screen *screen) { - return ((screen->debug_flags & DBG_NIR_PREFERRED) && - screen->family >= CHIP_CEDAR); + return (screen->debug_flags & DBG_NIR_PREFERRED); /* && + screen->family >= CHIP_CEDAR);*/ } /* @@ -629,7 +629,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, int ir = 0; if (shader == PIPE_SHADER_COMPUTE) ir = 1 << PIPE_SHADER_IR_NATIVE; - if (rscreen->b.family >= CHIP_CEDAR) { + if (is_nir_enabled(&rscreen->b)) { ir |= 1 << PIPE_SHADER_IR_TGSI; ir |= 1 << PIPE_SHADER_IR_NIR; }