Den 13.02.2018 kl. 18:05, skrev James Legg:
The conflict resolution on this commit has a typo, it should use
(index + i) instead of (index + 1).
Yep, attached fix for 17.3 branch...
--
Thomas
Commmit: ad764e365beb8a119369b97f22225cb95fc7ea8c
(ac/nir: Use instance_rate_inputs per attribute, not per variable)
in the 17.3 branch which is cherrypicked from 5a4dc285002e1924dbc8c72d17481a3dbc4c0142
and released in 17.3.4 contains a mis-merge noticed by James Legg during 17.3.4 review.
Fix that up.
Signed-off-by: Thomas Backlund <t...@mageia.org>
Reported-by: James Legg <jl...@feralinteractive.com>
---
diff -Nurp mesa-17.3.4.orig/src/amd/common/ac_nir_to_llvm.c mesa-17.3.4/src/amd/common/ac_nir_to_llvm.c
--- mesa-17.3.4.orig/src/amd/common/ac_nir_to_llvm.c
+++ mesa-17.3.4/src/amd/common/ac_nir_to_llvm.c
@@ -5117,7 +5117,7 @@ handle_vs_input_decl(struct nir_to_llvm_
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-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
