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

zink: only emit xfb execution mode for last vertex stage

Browse source 
this is otherwise illegal

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25914>
This commit is contained in:
Mike Blumenkrantz 2023-10-26 11:33:47 -04:00 • committed by Marge Bot
parent e8b2680045
commit 694ebe8c72
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4664,7 +4664,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySubgroupBallotKHR);
spirv_builder_emit_extension(&ctx.builder, "SPV_KHR_shader_ballot");
}
if (s->info.has_transform_feedback_varyings) {
if (s->info.has_transform_feedback_varyings && s->info.stage != MESA_SHADER_FRAGMENT) {
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityTransformFeedback);
spirv_builder_emit_exec_mode(&ctx.builder, entry_point,
SpvExecutionModeXfb);

2
src/gallium/drivers/zink/zink_compiler.c
View file

@ -2776,6 +2776,8 @@ zink_compiler_assign_io(struct zink_screen *screen, nir_shader *producer, nir_sh
optimize_nir(producer, NULL, true);
}
}
if (consumer->info.stage != MESA_SHADER_FRAGMENT)
producer->info.has_transform_feedback_varyings = false;
if (producer->info.stage == MESA_SHADER_TESS_CTRL) {
/* never assign from tcs -> tes, always invert */
nir_foreach_variable_with_modes(var, consumer, nir_var_shader_in)