Mesa (master): radv/gfx10: only compile the GS copy shader on-demand

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9d7ead6f9bc8d13126127b17302d927b1f74cdbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d7ead6f9bc8d13126127b17302d927b1f74cdbe

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jul 30 15:14:35 2019 +0200

radv/gfx10: only compile the GS copy shader on-demand

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 583b600dfdd..e11196bd82e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2626,7 +2626,8 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 
 	if(modules[MESA_SHADER_GEOMETRY]) {
 		struct radv_shader_binary *gs_copy_binary = NULL;
-		if (!pipeline->gs_copy_shader) {
+		if (!pipeline->gs_copy_shader &&
+		    !radv_pipeline_has_ngg(pipeline)) {
 			pipeline->gs_copy_shader = radv_create_gs_copy_shader(
 					device, nir[MESA_SHADER_GEOMETRY], &gs_copy_binary,
 					keys[MESA_SHADER_GEOMETRY].has_multiview_view_index);