From: Alejandro Piñeiro Date: Mon, 23 Oct 2017 15:19:34 +0000 (+0200) Subject: spirv: fill info.gs.input_primitive too X-Git-Tag: android-x86-8.1-r1~1566 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=624c00f1a6fd6e09fc5101a735a2c88e098ee675;p=android-x86%2Fexternal-mesa.git 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 --- diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 32ebdd78a1f..b5ec2de7bf9 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;