Mesa (master): spirv: fill info.gs.input_primitive too

[GitLab Mirror]

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

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Mon Oct 23 17:19:34 2017 +0200

spirv: fill info.gs.input_primitive too

info.gs.output_primitive was already being filled. Not sure why this
is not needed on Vulkan, but we found to be needed for
ARB_gl_spirv. Specifically, this is needed to get the following test
passing:

KHR-GL45.gl_spirv.spirv_validation_builtin_variable_decorations_test

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/compiler/spirv/spirv_to_nir.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 32ebdd78a1..b5ec2de7bf 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3690,6 +3690,8 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point,
          vtn_assert(b->shader->info.stage == MESA_SHADER_GEOMETRY);
          b->shader->info.gs.vertices_in =
             vertices_in_from_spv_execution_mode(b, mode->exec_mode);
+         b->shader->info.gs.input_primitive =
+            gl_primitive_from_spv_execution_mode(b, mode->exec_mode);
       }
       break;