From aa27a9f68790db83c728a721d7625f688119cf6c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 30 Mar 2017 12:06:52 +1000 Subject: radv: fix regression with mask attrib setting code. Signed-off-by: Dave Airlie --- src/amd/common/ac_nir_to_llvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 8f09b0d0d56..5e69a75b4cb 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4181,6 +4181,7 @@ handle_shader_output_decl(struct nir_to_llvm_context *ctx, unsigned mask_attribs; variable->data.driver_location = idx * 4; + mask_attribs = ((1ull << attrib_count) - 1) << idx; if (ctx->stage == MESA_SHADER_VERTEX || ctx->stage == MESA_SHADER_GEOMETRY) { if (idx == VARYING_SLOT_CLIP_DIST0) { @@ -4194,10 +4195,9 @@ handle_shader_output_decl(struct nir_to_llvm_context *ctx, attrib_count = 2; else attrib_count = 1; + mask_attribs = 1 << idx; } - mask_attribs = 1 << idx; - } else - mask_attribs = ((1ull << attrib_count) - 1) << idx; + } for (unsigned i = 0; i < attrib_count; ++i) { for (unsigned chan = 0; chan < 4; chan++) { -- cgit v1.2.3