fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 18:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv: Only set workgroup_size_variable on compute-like stages
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
This should be ignored on non-compute stages but AGX changes 3D shaders
to compute without setting the workgroup size and blows up if it claims
variable workgroups.  The safest thing is to only set it from
spirv_to_nir for stages that actually have workgroups.

Fixes: 6d9f563960 ("spirv: Assume variable workgroup size unless it's set")
LoLed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38555>
This commit is contained in:
Faith Ekstrand 2025-11-20 10:26:47 -05:00 • committed by Marge Bot
parent 0f2dcf656a
commit 17b9bc2770
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/spirv/spirv_to_nir.c
View file

@ -7302,7 +7302,8 @@ spirv_to_nir(const uint32_t *words, size_t word_count,
b->shader = nir_shader_create(b, stage, nir_options);
b->shader->info.float_controls_execution_mode = options->float_controls_execution_mode;
b->shader->info.workgroup_size_variable = true;
if (mesa_shader_stage_uses_workgroup(stage))
b->shader->info.workgroup_size_variable = true;
b->shader->info.cs.shader_index = options->shader_index;
b->shader->has_debug_info = options->debug_info;
_mesa_blake3_compute(words, word_count * sizeof(uint32_t), b->shader->info.source_blake3);