fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 12:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pan/midgard: Include condition in branch->src[0]

Browse source 
This will allow us to reference the condition while scheduling.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-08-26 13:59:29 -07:00
parent bd79cddafa
commit d6e4e36566
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/panfrost/midgard/midgard_compile.c
View file

@ -1416,6 +1416,10 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
bool conditional = instr->intrinsic == nir_intrinsic_discard_if;
struct midgard_instruction discard = v_branch(conditional, false);
discard.branch.target_type = TARGET_DISCARD;
if (conditional)
discard.src[0] = nir_src_index(ctx, &instr->src[0]);
emit_mir_instruction(ctx, discard);
break;
}
@ -2318,6 +2322,7 @@ emit_if(struct compiler_context *ctx, nir_if *nif)
/* Speculatively emit the branch, but we can't fill it in until later */
EMIT(branch, true, true);
midgard_instruction *then_branch = mir_last_in_block(ctx->current_block);
then_branch->src[0] = nir_src_index(ctx, &nif->condition);
/* Emit the two subblocks. */
midgard_block *then_block = emit_cf_list(ctx, &nif->then_list);