Mesa (master): radv: fix exporting multiviews with NGG

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Nov 27 15:29:34 2020 +0100

radv: fix exporting multiviews with NGG

If a subpass uses multiview but the fragment shader doesn't load it
we still have to export it.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7815>

---

 src/amd/vulkan/radv_shader_args.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index c6070dfe8ef..ef6e170899a 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -89,11 +89,16 @@ static bool needs_view_index_sgpr(struct radv_shader_args *args,
 		if (args->shader_info->needs_multiview_view_index || (!args->options->key.vs_common_out.as_es && args->options->key.has_multiview_view_index))
 			return true;
 		break;
-	case MESA_SHADER_GEOMETRY:
 	case MESA_SHADER_TESS_CTRL:
 		if (args->shader_info->needs_multiview_view_index)
 			return true;
 		break;
+	case MESA_SHADER_GEOMETRY:
+		if (args->shader_info->needs_multiview_view_index ||
+		    (args->options->key.vs_common_out.as_ngg &&
+		     args->options->key.has_multiview_view_index))
+			return true;
+		break;
 	default:
 		break;
 	}