Module: Mesa
Branch: 17.3
Commit: de93e457346aafbbfccbee071d6bc13f413ba876
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=de93e457346aafbbfccbee071d6bc13f413ba876
Author: James Legg <jl...@feralinteractive.com>
Date: Tue Feb 13 16:05:54 2018 +0000
ac/nir: Fix conflict resolution typo in handle_vs_input_decl
Fixes ad764e365beb8a119369b97f22225cb95fc7ea8c:
"ac/nir: Use instance_rate_inputs per attribute, not per variable".
CC: <mesa-sta...@lists.freedesktop.org>
CC: Emil Velikov <emil.l.veli...@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
---
src/amd/common/ac_nir_to_llvm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index dde6cbc8f5..4812debb2f 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -5117,7 +5117,7 @@ handle_vs_input_decl(struct nir_to_llvm_context *ctx,
variable->data.driver_location = idx * 4;
for (unsigned i = 0; i < attrib_count; ++i, ++idx) {
- if (ctx->options->key.vs.instance_rate_inputs & (1u << (index +
1))) {
+ if (ctx->options->key.vs.instance_rate_inputs & (1u << (index +
i))) {
buffer_index = LLVMBuildAdd(ctx->builder,
ctx->abi.instance_id,
ctx->abi.start_instance,
"");
ctx->shader_info->vs.vgpr_comp_cnt =
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
