From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Tue, 9 Jul 2019 09:00:33 +0000 (+0200)
Subject: Revert "radv: keep track of whether NGG is used for GS on GFX10"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9070743a9273b8601af7955a58b604628dfcc8d;p=mesa.git

Revert "radv: keep track of whether NGG is used for GS on GFX10"

This reverts commit 63e0675d986744a9ed2d9a15b7cba84ff4a24fc2.

The GS is merged with the preceding shader and since the preceding
shader will have as_ngg set the final binary will have is_ngg set.

So we do not need the gs key here.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 1b89518a383..67630c4ee92 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -3972,7 +3972,6 @@ ac_fill_shader_info(struct radv_shader_variant_info *shader_info, struct nir_sha
                 shader_info->gs.vertices_out = nir->info.gs.vertices_out;
                 shader_info->gs.output_prim = nir->info.gs.output_primitive;
                 shader_info->gs.invocations = nir->info.gs.invocations;
-                shader_info->is_ngg = options->key.gs.as_ngg;
                 break;
         case MESA_SHADER_TESS_EVAL:
                 shader_info->tes.primitive_mode = nir->info.tess.primitive_mode;
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index be43204a7b4..acf141b80e7 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2259,9 +2259,7 @@ radv_fill_shader_keys(struct radv_device *device,
 	}
 
 	if (device->physical_device->rad_info.chip_class >= GFX10) {
-		if (nir[MESA_SHADER_GEOMETRY]) {
-			keys[MESA_SHADER_GEOMETRY].gs.as_ngg = true;
-		} else if (nir[MESA_SHADER_TESS_CTRL]) {
+		if (nir[MESA_SHADER_TESS_CTRL]) {
 			keys[MESA_SHADER_TESS_EVAL].tes.out.as_ngg = true;
 		} else {
 			keys[MESA_SHADER_VERTEX].vs.out.as_ngg = true;
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index b4f833d7570..f8933614bd7 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -112,18 +112,12 @@ struct radv_fs_variant_key {
 	uint32_t is_int10;
 };
 
-
-struct radv_gs_variant_key {
-	uint32_t as_ngg:1;
-};
-
 struct radv_shader_variant_key {
 	union {
 		struct radv_vs_variant_key vs;
 		struct radv_fs_variant_key fs;
 		struct radv_tes_variant_key tes;
 		struct radv_tcs_variant_key tcs;
-		struct radv_gs_variant_key gs;
 	};
 	bool has_multiview_view_index;
 };