From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 13 Jan 2020 08:49:49 +0000 (+0100)
Subject: radv/gfx10: re-enable NGG GS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a61eff8330234306077444e97e178542991f6e27;p=mesa.git

radv/gfx10: re-enable NGG GS

Now that NGG GS queries are implemented, it should be safe enough
to enable NGG GS by default. It can be disabled with RADV_DEBUG=nongg
if necessary.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3380>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3380>
---

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 26e45e2a76e..b065ca4258c 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2435,21 +2435,6 @@ radv_fill_shader_keys(struct radv_device *device,
 			keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
 		}
 
-		/*
-		 * Disable NGG with geometry shaders. There are a bunch of
-		 * issues still:
-		 *   * GS primitives in pipeline statistic queries do not get
-		 *     updates. See dEQP-VK.query_pool.statistics_query.geometry_shader_primitives
-		 *
-		 * Furthermore, XGL/AMDVLK also disables this as of 9b632ef.
-		 */
-		if (nir[MESA_SHADER_GEOMETRY]) {
-			if (nir[MESA_SHADER_TESS_CTRL])
-				keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
-			else
-				keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg = false;
-		}
-
 		gl_shader_stage last_xfb_stage = MESA_SHADER_VERTEX;
 
 		for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {