AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: pass sw_stage when setup_isel_context

Browse Source 
We are going to add more shader parts.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24712>
This commit is contained in:
Qiang Yu
2023-08-03 17:08:17 +08:00
committed by Marge Bot
parent ffd7328547
commit eb4f871034
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_instruction_selection.cpp
+3 -3
View File
@@ -11680,7 +11680,7 @@ select_program(Program* program, unsigned shader_count, struct nir_shader* const
const struct aco_shader_info* info, const struct ac_shader_args* args)
{
isel_context ctx =
setup_isel_context(program, shader_count, shaders, config, options, info, args, false, false);
setup_isel_context(program, shader_count, shaders, config, options, info, args);
if (ctx.stage == raytracing_cs)
return select_program_rt(ctx, shader_count, shaders, args);
@@ -12285,7 +12285,7 @@ select_ps_epilog(Program* program, void* pinfo, ac_shader_config* config,
{
const struct aco_ps_epilog_info* einfo = (const struct aco_ps_epilog_info*)pinfo;
isel_context ctx =
setup_isel_context(program, 0, NULL, config, options, info, args, true, false);
setup_isel_context(program, 0, NULL, config, options, info, args, SWStage::FS);
ctx.block->fp_mode = program->next_fp_mode;
@@ -12355,7 +12355,7 @@ select_tcs_epilog(Program* program, void* pinfo, ac_shader_config* config,
{
const struct aco_tcs_epilog_info* einfo = (const struct aco_tcs_epilog_info*)pinfo;
isel_context ctx =
setup_isel_context(program, 0, NULL, config, options, info, args, false, true);
setup_isel_context(program, 0, NULL, config, options, info, args, SWStage::TCS);
ctx.block->fp_mode = program->next_fp_mode;
src/amd/compiler/aco_instruction_selection.h
+2 -2
View File
@@ -118,8 +118,8 @@ isel_context setup_isel_context(Program* program, unsigned shader_count,
struct nir_shader* const* shaders, ac_shader_config* config,
const struct aco_compiler_options* options,
const struct aco_shader_info* info,
const struct ac_shader_args* args, bool is_ps_epilog,
bool is_tcs_epilog);
const struct ac_shader_args* args,
SWStage sw_stage = SWStage::None);
} // namespace aco
src/amd/compiler/aco_instruction_selection_setup.cpp
+1 -12
View File
@@ -649,9 +649,8 @@ isel_context
setup_isel_context(Program* program, unsigned shader_count, struct nir_shader* const* shaders,
ac_shader_config* config, const struct aco_compiler_options* options,
const struct aco_shader_info* info, const struct ac_shader_args* args,
bool is_ps_epilog, bool is_tcs_epilog)
SWStage sw_stage)
{
SWStage sw_stage = SWStage::None;
for (unsigned i = 0; i < shader_count; i++) {
switch (shaders[i]->info.stage) {
case MESA_SHADER_VERTEX: sw_stage = sw_stage | SWStage::VS; break;
@@ -673,16 +672,6 @@ setup_isel_context(Program* program, unsigned shader_count, struct nir_shader* c
}
}
if (is_ps_epilog) {
assert(shader_count == 0 && !shaders);
sw_stage = SWStage::FS;
}
if (is_tcs_epilog) {
assert(shader_count == 0 && !shaders);
sw_stage = SWStage::TCS;
}
init_program(program, Stage{info->hw_stage, sw_stage}, info, options->gfx_level, options->family,
options->wgp_mode, config);