zink: lower subgroup width to 1 for unsupported subgroup vote stages
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 31 May 2022 13:02:06 +0000 (09:02 -0400)
committerMarge Bot <emma+marge@anholt.net>
Tue, 31 May 2022 14:45:02 +0000 (14:45 +0000)
this should handle unsupported gfx subgroup vote

cc: mesa-stable

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16757>

src/gallium/drivers/zink/zink_compiler.c

index 4334107..21923ed 100644 (file)
@@ -2203,6 +2203,10 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
       subgroup_options.ballot_bit_size = 32;
       subgroup_options.ballot_components = 4;
       subgroup_options.lower_subgroup_masks = true;
+      if (!(screen->info.subgroup.supportedStages & mesa_to_vk_shader_stage(nir->info.stage))) {
+         subgroup_options.subgroup_size = 1;
+         subgroup_options.lower_vote_trivial = true;
+      }
       NIR_PASS_V(nir, nir_lower_subgroups, &subgroup_options);
    }