From: Alyssa Rosenzweig Date: Fri, 6 Dec 2019 21:45:57 +0000 (-0500) Subject: gallium/util: Support POLYGON in u_stream_outputs_for_vertices X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a37822f5f740c55cd6f848adfd6c3d567ae4fd79;p=mesa.git gallium/util: Support POLYGON in u_stream_outputs_for_vertices u_decomposed_prims_for_vertices cannot support POLYGON, but POLYGON is trivial to support as a special case directly (since we have the number of vertices directly). Fixes aborts in Panfrost in apps using GL_POLYGON. Fixes: e881aa8c12c ("gallium/util: Add u_stream_outputs_for_vertices helper") Signed-off-by: Alyssa Rosenzweig Revewied-by: Eric Anholt --- diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h index d80e235ffd9..b4c06df01e0 100644 --- a/src/gallium/auxiliary/util/u_prim.h +++ b/src/gallium/auxiliary/util/u_prim.h @@ -338,7 +338,14 @@ u_stream_outputs_for_vertices(enum pipe_prim_type primitive, unsigned nr) /* Extraneous vertices don't contribute to stream outputs */ u_trim_pipe_prim(primitive, &nr); - /* Consider how many primitives are actually generated */ + /* Polygons are special, since they are a single primitive with many + * vertices. In this case, we just have an output for each vertex (after + * trimming) */ + + if (primitive == PIPE_PRIM_POLYGON) + return nr; + + /* Normally, consider how many primitives are actually generated */ unsigned prims = u_decomposed_prims_for_vertices(primitive, nr); /* One output per vertex after decomposition */