fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 05:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600: Fix reporting TGSI IR support

Browse source 
When NIR is not explicitely enabled we still support TGSI.

Fixes: 33765aa92a
    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/18212>
(cherry picked from commit 90f99369ae)
This commit is contained in:
Gert Wollny 2022-08-23 16:21:39 +02:00 • committed by Dylan Baker
parent 29415adbaa
commit ad7ec70ca6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -10282,7 +10282,7 @@
"description": "r600: Fix reporting TGSI IR support",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "33765aa92aa5c150873fc210e9d6c1fe22cf8646"
},

2
src/gallium/drivers/r600/r600_pipe.c
View file

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