summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2021-01-09 16:24:42 -0500
committerMarge Bot <eric+marge@anholt.net>2021-01-20 21:53:13 +0000
commit2206840f6c1e21435908abe1ca735ea524d850c5 (patch)
tree9670a7262dc74d3f65271a5f416b70750cf53df1
parent888a45a36217f0ccac8d6afd5937dc3a5f3f5828 (diff)
radeonsi: enable the GS tri strip adj workaround with primitive_restart
If a primitive restart index occurs after an even number of triangles, the workaround works. Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8600>
-rw-r--r--src/gallium/drivers/radeonsi/si_state_draw.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp
index d1a2ff67cef..685336755e6 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp
@@ -1717,13 +1717,12 @@ static void si_draw_vbo(struct pipe_context *ctx,
if (GFX_VERSION <= GFX9 && HAS_GS) {
/* Determine whether the GS triangle strip adjacency fix should
- * be applied. Rotate every other triangle if
- * - triangle strips with adjacency are fed to the GS and
- * - primitive restart is disabled (the rotation doesn't help
- * when the restart occurs after an odd number of triangles).
+ * be applied. Rotate every other triangle if triangle strips with
+ * adjacency are fed to the GS. This doesn't work if primitive
+ * restart occurs after an odd number of triangles.
*/
bool gs_tri_strip_adj_fix =
- !HAS_TESS && prim == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY && !primitive_restart;
+ !HAS_TESS && prim == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY;
if (gs_tri_strip_adj_fix != sctx->gs_tri_strip_adj_fix) {
sctx->gs_tri_strip_adj_fix = gs_tri_strip_adj_fix;