AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: handle max_vertices=0 in geometry shader

Browse Source 
this is a weird corner case where glsl permits a zero value, so clamp to 1
and then don't emit any vertices to avoid driver hangs

affects:
dEQP-GL45-ES31.functional.geometry_shading.emit.points_emit_0_end_0

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17639>
This commit is contained in:
Mike Blumenkrantz
2022-07-11 12:04:22 -04:00
parent efc827ceea
commit 5b58f8df53
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+4 -3
View File
@@ -3060,8 +3060,9 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr)
*/
if (ctx->sinfo)
emit_so_outputs(ctx, ctx->sinfo);
spirv_builder_emit_vertex(&ctx->builder, nir_intrinsic_stream_id(intr),
ctx->nir->info.stage == MESA_SHADER_GEOMETRY && util_bitcount(ctx->nir->info.gs.active_stream_mask) > 1);
if (ctx->nir->info.gs.vertices_out) //skip vertex emission if !vertices_out
spirv_builder_emit_vertex(&ctx->builder, nir_intrinsic_stream_id(intr),
ctx->nir->info.stage == MESA_SHADER_GEOMETRY && util_bitcount(ctx->nir->info.gs.active_stream_mask) > 1);
break;
case nir_intrinsic_set_vertex_and_primitive_count:
@@ -4336,7 +4337,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
s->info.gs.invocations);
spirv_builder_emit_exec_mode_literal(&ctx.builder, entry_point,
SpvExecutionModeOutputVertices,
s->info.gs.vertices_out);
MAX2(s->info.gs.vertices_out, 1));
break;
case MESA_SHADER_COMPUTE:
if (s->info.shared_size)