From 56495080ed910c8fb7cd02aa5e3b14e0fb823c6d Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 24 Jan 2017 11:49:40 +0100 Subject: [PATCH] spirv: handle gl_SampleMask SPIR-V maps both gl_SampleMask and gl_SampleMaskIn to the same builtin (SampleMask). The only way to tell which one we are dealing with is to check if it is an input or an output. Fixes: dEQP-VK.pipeline.multisample_shader_builtin.sample_mask.write.* Reviewed-by: Jason Ekstrand Reviewed-by: Anuj Phogat Reviewed-by: Lionel Landwerlin --- src/compiler/spirv/vtn_variables.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index d55f81e5d34..4d1ec789cc3 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -975,8 +975,12 @@ vtn_get_builtin_location(struct vtn_builder *b, set_mode_system_value(mode); break; case SpvBuiltInSampleMask: - *location = SYSTEM_VALUE_SAMPLE_MASK_IN; /* XXX out? */ - set_mode_system_value(mode); + if (*mode == nir_var_shader_out) { + *location = FRAG_RESULT_SAMPLE_MASK; + } else { + *location = SYSTEM_VALUE_SAMPLE_MASK_IN; + set_mode_system_value(mode); + } break; case SpvBuiltInFragDepth: *location = FRAG_RESULT_DEPTH; -- 2.30.2