ac/nir: Fix conflict resolution typo in handle_vs_input_decl

Submitted by James Legg on Feb. 13, 2018, 4:05 p.m.

Details

Message ID 20180213160554.25508-2-jlegg@feralinteractive.com
State New
Headers show
Series "Mesa 17.3.4 release candidate" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

James Legg Feb. 13, 2018, 4:05 p.m.
Fixes ad764e365beb8a119369b97f22225cb95fc7ea8c:
"ac/nir: Use instance_rate_inputs per attribute, not per variable".

CC: <mesa-stable@lists.freedesktop.org>
CC: Emil Velikov <emil.l.velikov@gmail.com>
CC: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---
 src/amd/common/ac_nir_to_llvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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 =

Comments

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

On Tue, Feb 13, 2018 at 5:05 PM, James Legg <jlegg@feralinteractive.com>
wrote:

> Fixes ad764e365beb8a119369b97f22225cb95fc7ea8c:
> "ac/nir: Use instance_rate_inputs per attribute, not per variable".
>
> CC: <mesa-stable@lists.freedesktop.org>
> CC: Emil Velikov <emil.l.velikov@gmail.com>
> CC: Bas Nieuwenhuizen <bas@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 =
> --
> 2.14.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>