diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-02-26 12:20:31 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-02-26 12:20:31 +0000 |
| commit | 9b2e362559110085d2ff9b90fea11fa81e704a78 (patch) | |
| tree | b114259e6fecf369e1e7b90f3bb8116fa08b1cf1 /lib/mesa/src/amd/common | |
| parent | b5fce4e6eb297a6f7fabd0d6c6b4ffdfefa6ad8b (diff) | |
Import Mesa 13.0.5
Diffstat (limited to 'lib/mesa/src/amd/common')
| -rw-r--r-- | lib/mesa/src/amd/common/ac_nir_to_llvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mesa/src/amd/common/ac_nir_to_llvm.c b/lib/mesa/src/amd/common/ac_nir_to_llvm.c index ccf10ac11..4f816a412 100644 --- a/lib/mesa/src/amd/common/ac_nir_to_llvm.c +++ b/lib/mesa/src/amd/common/ac_nir_to_llvm.c @@ -3946,7 +3946,7 @@ static void handle_shader_output_decl(struct nir_to_llvm_context *ctx, struct nir_variable *variable) { - int idx = variable->data.location; + int idx = variable->data.location + variable->data.index; unsigned attrib_count = glsl_count_attribute_slots(variable->type, false); variable->data.driver_location = idx * 4; @@ -3976,7 +3976,7 @@ handle_shader_output_decl(struct nir_to_llvm_context *ctx, si_build_alloca_undef(ctx, ctx->f32, ""); } } - ctx->output_mask |= ((1ull << attrib_count) - 1) << variable->data.location; + ctx->output_mask |= ((1ull << attrib_count) - 1) << idx; } static void |