fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: enable CapabilityDemoteToHelperInvocation and extension only if required

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33492>
This commit is contained in:
Daniel Schürmann 2025-02-11 11:40:27 +01:00 • committed by Marge Bot
parent efaaaf45d1
commit 795706f3d6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -3167,9 +3167,6 @@ emit_is_helper_invocation(struct ntv_context *ctx, nir_intrinsic_instr *intr)
{
SpvId result;
if (!ctx->have_spirv16 && ctx->nir->options->discard_is_demote) {
spirv_builder_emit_extension(&ctx->builder,
"SPV_EXT_demote_to_helper_invocation");
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityDemoteToHelperInvocation);
result = spirv_is_helper_invocation(&ctx->builder);
} else {
SpvId var_type = spirv_builder_type_bool(&ctx->builder);
@ -3448,7 +3445,6 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr)
break;
case nir_intrinsic_demote:
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityDemoteToHelperInvocation);
spirv_builder_emit_demote(&ctx->builder);
break;
@ -4628,10 +4624,19 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, const s
case MESA_SHADER_FRAGMENT:
if (s->info.fs.uses_sample_shading)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampleRateShading);
if (s->info.fs.uses_discard && spirv_version < SPIRV_VERSION(1, 6) &&
screen->info.have_EXT_shader_demote_to_helper_invocation)
spirv_builder_emit_extension(&ctx.builder,
"SPV_EXT_demote_to_helper_invocation");
if (s->info.fs.uses_discard && screen->info.have_EXT_shader_demote_to_helper_invocation) {
if (!ctx.have_spirv16)
spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_demote_to_helper_invocation");
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityDemoteToHelperInvocation);
}
if (BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_HELPER_INVOCATION) &&
screen->info.have_EXT_shader_demote_to_helper_invocation && !ctx.have_spirv16) {
spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_demote_to_helper_invocation");
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityDemoteToHelperInvocation);
}
break;
case MESA_SHADER_VERTEX: