r600/sfn: Enable NIR for pre RG hardware

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Filip Gawin <filip@gawin.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17822>
This commit is contained in:
Gert Wollny 2022-07-28 13:02:22 +02:00 committed by Marge Bot
parent d7a3f17a79
commit 33765aa92a

View file

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