pan/midgard: Pass uploaded midgard_instruction through

We want to edit it after emission in some cases.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig
2019-08-02 17:09:54 -07:00
parent fa68740187
commit e7ac46be7a
2 changed files with 7 additions and 5 deletions
+5 -3
View File
@@ -278,10 +278,12 @@ mir_upload_ins(struct midgard_instruction ins)
return heap;
}
static inline void
static inline midgard_instruction *
emit_mir_instruction(struct compiler_context *ctx, struct midgard_instruction ins)
{
list_addtail(&(mir_upload_ins(ins))->link, &ctx->current_block->instructions);
midgard_instruction *u = mir_upload_ins(ins);
list_addtail(&u->link, &ctx->current_block->instructions);
return u;
}
static inline struct midgard_instruction *
@@ -526,7 +528,7 @@ void mir_create_pipeline_registers(compiler_context *ctx);
void
midgard_promote_uniforms(compiler_context *ctx, unsigned promoted_count);
void
midgard_instruction *
emit_ubo_read(
compiler_context *ctx,
unsigned dest,
+2 -2
View File
@@ -1139,7 +1139,7 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
/* Uniforms and UBOs use a shared code path, as uniforms are just (slightly
* optimized) versions of UBO #0 */
void
midgard_instruction *
emit_ubo_read(
compiler_context *ctx,
unsigned dest,
@@ -1164,7 +1164,7 @@ emit_ubo_read(
ins.load_store.arg_1 = index;
emit_mir_instruction(ctx, ins);
return emit_mir_instruction(ctx, ins);
}
static void