From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 20 Mar 2020 21:45:17 +0000 (-0400)
Subject: radeonsi/gfx10: don't use NGG culling if compute-based culling is used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee4d797d8b074c27de0e055d2e22b82f642f2359;p=mesa.git

radeonsi/gfx10: don't use NGG culling if compute-based culling is used

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4269>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 96fa59145ae..dc6de604d21 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -2040,6 +2040,7 @@ static void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *i
 
 	/* Update NGG culling settings. */
 	if (sctx->ngg &&
+	    !dispatch_prim_discard_cs &&
 	    rast_prim == PIPE_PRIM_TRIANGLES &&
 	    (sctx->screen->always_use_ngg_culling ||
 	     /* At least 1024 non-indexed vertices (8 subgroups) are needed