diff options
| author | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2021-05-05 12:24:44 -0700 |
|---|---|---|
| committer | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2021-06-08 09:23:55 -0700 |
| commit | 8af6766062044167fb3b61950ddbc7d67e4c3e48 (patch) | |
| tree | 9d74934c90d19501867bfdc53dfd318d7e221114 /src/amd/compiler | |
| parent | b5f6fc442c1014e2e05f752d971a2276ae6cd13e (diff) | |
nir: Move workgroup_size and workgroup_variable_size into common shader_info
Move it out the "cs" sub-struct, since these will be used for other
shader stages in the future.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11225>
Diffstat (limited to 'src/amd/compiler')
| -rw-r--r-- | src/amd/compiler/aco_instruction_selection_setup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp index f60937fc9c0..15f9ce33b84 100644 --- a/src/amd/compiler/aco_instruction_selection_setup.cpp +++ b/src/amd/compiler/aco_instruction_selection_setup.cpp @@ -1078,9 +1078,9 @@ setup_isel_context(Program* program, program->workgroup_size = program->wave_size; } else if (program->stage == compute_cs) { /* CS sets the workgroup size explicitly */ - program->workgroup_size = shaders[0]->info.cs.workgroup_size[0] * - shaders[0]->info.cs.workgroup_size[1] * - shaders[0]->info.cs.workgroup_size[2]; + program->workgroup_size = shaders[0]->info.workgroup_size[0] * + shaders[0]->info.workgroup_size[1] * + shaders[0]->info.workgroup_size[2]; } else if (program->stage.hw == HWStage::ES || program->stage == geometry_gs) { /* Unmerged ESGS operate in workgroups if on-chip GS (LDS rings) are enabled on GFX7-8 (not implemented in Mesa) */ program->workgroup_size = program->wave_size; |