Module: Mesa Branch: staging/22.2 Commit: af62826680f1fc52736dca018bc0c02c0e01c3b6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=af62826680f1fc52736dca018bc0c02c0e01c3b6
Author: Gert Wollny <[email protected]> Date: Tue Aug 23 16:21:39 2022 +0200 r600: Fix reporting TGSI IR support When NIR is not explicitely enabled we still support TGSI. Fixes: 33765aa92aa5c150873fc210e9d6c1fe22cf8646 r600/sfn: Enable NIR for pre RG hardware Signed-off-by: Gert Wollny <[email protected]> Reviewed-by: Filip Gawin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18212> (cherry picked from commit 90f99369aeccf2a52495319930ff23b8ffa2a691) --- .pick_status.json | 2 +- src/gallium/drivers/r600/r600_pipe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bb3015f3901..c372882549f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2875,7 +2875,7 @@ "description": "r600: Fix reporting TGSI IR support", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "33765aa92aa5c150873fc210e9d6c1fe22cf8646" }, diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 523b8b35c63..d0a880b8e98 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -629,8 +629,8 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, int ir = 0; if (shader == PIPE_SHADER_COMPUTE) ir = 1 << PIPE_SHADER_IR_NATIVE; + ir |= 1 << PIPE_SHADER_IR_TGSI; if (is_nir_enabled(&rscreen->b)) { - ir |= 1 << PIPE_SHADER_IR_TGSI; ir |= 1 << PIPE_SHADER_IR_NIR; } return ir;
