From 10773ed2498f1482fcfd8933efdf6797c980491c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 18 Dec 2015 12:25:53 +0000 Subject: [PATCH] r600/shader: split address get out to a function. This will be used in the tess shaders. Reviewed-by: Oded Gabbay Signed-off-by: Dave Airlie (cherry picked from commit 4d64459a92a4c1a64fb7051fd1320c14c1854dcb) [Emil Velikov: required by the commit after the next one] Nominated-by: Emil Velikov --- src/gallium/drivers/r600/r600_shader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index b16900bc698..9cd148a1950 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -598,6 +598,11 @@ static int select_twoside_color(struct r600_shader_ctx *ctx, int front, int back return 0; } +static inline int get_address_file_reg(struct r600_shader_ctx *ctx, int index) +{ + return index > 0 ? ctx->bc->index_reg[index - 1] : ctx->bc->ar_reg; +} + static int vs_add_primid_output(struct r600_shader_ctx *ctx, int prim_id_sid) { int i; @@ -6675,7 +6680,7 @@ static int tgsi_eg_arl(struct r600_shader_ctx *ctx) struct r600_bytecode_alu alu; int r; int i, lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask); - unsigned reg = inst->Dst[0].Register.Index > 0 ? ctx->bc->index_reg[inst->Dst[0].Register.Index - 1] : ctx->bc->ar_reg; + unsigned reg = get_address_file_reg(ctx, inst->Dst[0].Register.Index); assert(inst->Dst[0].Register.Index < 3); memset(&alu, 0, sizeof(struct r600_bytecode_alu)); -- 2.11.0