From 5f35cdaa8dd78ee97bccdab82ef21b6ad6fe1108 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 30 Apr 2020 16:10:55 -0400 Subject: pan/bi: Pipe multiple textures through Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bifrost_compile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/panfrost/bifrost/bifrost_compile.c') diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index ca4aa427b49..cd659809a62 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -692,13 +692,13 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr) static void emit_tex_compact(bi_context *ctx, nir_tex_instr *instr) { - /* TODO: Pipe through indices */ - assert(instr->texture_index == 0); - assert(instr->sampler_index == 0); - bi_instruction tex = { .type = BI_TEX, .op = { .texture = BI_TEX_COMPACT }, + .texture = { + .texture_index = instr->texture_index, + .sampler_index = instr->sampler_index, + }, .dest = pan_dest_index(&instr->dest), .dest_type = instr->dest_type, .src_types = { nir_type_float32, nir_type_float32 }, -- cgit v1.2.3