From 488c93ac117f8ee5f23f1565396624f4c961a941 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Wed, 23 Dec 2020 22:42:45 +0100 Subject: [PATCH] r600/sfn: use lowering pass for cube textures Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index b7e5324d608..0767f1bb71a 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -840,6 +840,7 @@ bool r600_lower_to_scalar_instr_filter(const nir_instr *instr, const void *) case nir_op_fdot2: case nir_op_fdot3: case nir_op_fdot4: + case nir_op_cube_r600: return false; case nir_op_bany_fnequal2: case nir_op_ball_fequal2: @@ -890,8 +891,8 @@ int r600_shader_from_nir(struct r600_context *rctx, }; NIR_PASS_V(sel->nir, nir_lower_tex, &lower_tex_options); NIR_PASS_V(sel->nir, r600::r600_nir_lower_txl_txf_array_or_cube); + NIR_PASS_V(sel->nir, r600::r600_nir_lower_cube_to_2darray); - NIR_PASS_V(sel->nir, r600_nir_lower_int_tg4); NIR_PASS_V(sel->nir, r600_nir_lower_pack_unpack_2x16); nir_variable_mode io_modes = nir_var_uniform;