From 0ab1a3957a0a1335a1aabffee0fceed57ef0e59d Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 23 May 2016 15:17:02 -0700 Subject: [PATCH] i965: If control_data_header_size_bits is zero, don't do EndPrimitive This can occur when max_vertices=0 is explicitly specified. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke Cc: "12.0" (cherry picked from commit b27dfa5403ed1884999524417c08d2bc50365965) --- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 3 +++ src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 58191fc5611..e9f6999f9c3 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -1668,6 +1668,9 @@ fs_visitor::emit_gs_end_primitive(const nir_src &vertex_count_nir_src) struct brw_gs_prog_data *gs_prog_data = (struct brw_gs_prog_data *) prog_data; + if (gs_compile->control_data_header_size_bits == 0) + return; + /* We can only do EndPrimitive() functionality when the control data * consists of cut bits. Fortunately, the only time it isn't is when the * output type is points, in which case EndPrimitive() is a no-op. diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 76a80a54f44..927438f9345 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -539,6 +539,9 @@ vec4_gs_visitor::gs_end_primitive() return; } + if (c->control_data_header_size_bits == 0) + return; + /* Cut bits use one bit per vertex. */ assert(c->control_data_bits_per_vertex == 1); -- 2.11.0