NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

radeonsi: enable aco compilation for merged shader parts

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25632>
This commit is contained in:
Qiang Yu 2023-08-29 14:28:50 +08:00
parent 0f23af5c0a
commit 18f79f4636
1 changed files with 1 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -2443,22 +2443,7 @@ static void si_determine_use_aco(struct si_shader *shader)
if (!sel->screen->info.has_graphics)
return;
switch (sel->stage) {
case MESA_SHADER_VERTEX:
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
case MESA_SHADER_GEOMETRY:
shader->use_aco =
!si_is_multi_part_shader(shader) || shader->is_monolithic ||
shader->is_gs_copy_shader;
break;
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
shader->use_aco = true;
break;
default:
break;
}
shader->use_aco = true;
}
/* Generate code for the hardware VS shader stage to go with a geometry shader */
@ -2961,19 +2946,6 @@ si_get_shader_part(struct si_screen *sscreen, struct si_shader_part **list,
result->key = *key;
bool use_aco = (sscreen->debug_flags & DBG(USE_ACO)) && sscreen->info.has_graphics;
if (use_aco) {
switch (stage) {
case MESA_SHADER_VERTEX:
use_aco = sscreen->info.gfx_level <= GFX8 ||
!(key->vs_prolog.as_ls || key->vs_prolog.as_es);
break;
case MESA_SHADER_TESS_CTRL:
use_aco = sscreen->info.gfx_level <= GFX8;
break;
default:
break;
}
}
bool ok = use_aco ?
si_aco_build_shader_part(sscreen, stage, prolog, debug, name, result) :