Mesa (master): radeonsi/nir: support interface output types to fix SPIR-V xfb piglits

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Nov  6 20:50:26 2019 -0500

radeonsi/nir: support interface output types to fix SPIR-V xfb piglits

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader_nir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 342abe36dd0..d050ff0bc09 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -547,7 +547,7 @@ static void scan_output_helper(const nir_variable *var,
 			       const struct glsl_type *type,
 			       struct tgsi_shader_info *info)
 {
-	if (glsl_type_is_struct(type)) {
+	if (glsl_type_is_struct(type) || glsl_type_is_interface(type)) {
 		for (unsigned i = 0; i < glsl_get_length(type); i++) {
 			const struct glsl_type *ft = glsl_get_struct_field(type, i);
 			scan_output_helper(var, location, ft, info);