From 369270906b77e83acaf35225104e5af25d72a3bc Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Sat, 12 Aug 2023 19:18:51 -0500 Subject: [PATCH] st,zink,sfn: Use nir_foreach_def instead of nir_foreach_dest It's basically the same code in all three. Acked-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp | 6 +++--- src/gallium/drivers/zink/zink_compiler.c | 6 +++--- src/mesa/state_tracker/st_glsl_to_nir.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp index d5e00ea..eda5108 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp @@ -1471,9 +1471,9 @@ check_64_bit_op_src(nir_src *src, void *state) } static bool -check_64_bit_op_dest(nir_dest *dest, void *state) +check_64_bit_op_def(nir_def *def, void *state) { - if (nir_dest_bit_size(*dest) == 64) { + if (def->bit_size == 64) { *(bool *)state = true; return false; } @@ -1486,7 +1486,7 @@ AluInstr::from_nir(nir_alu_instr *alu, Shader& shader) bool is_64bit_op = false; nir_foreach_src(&alu->instr, check_64_bit_op_src, &is_64bit_op); if (!is_64bit_op) - nir_foreach_dest(&alu->instr, check_64_bit_op_dest, &is_64bit_op); + nir_foreach_def(&alu->instr, check_64_bit_op_def, &is_64bit_op); if (is_64bit_op) { switch (alu->op) { diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index e77751c..0732d8e 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -1420,10 +1420,10 @@ zink_tgsi_to_nir(struct pipe_screen *screen, const struct tgsi_token *tokens) static bool -dest_is_64bit(nir_dest *dest, void *state) +def_is_64bit(nir_def *def, void *state) { bool *lower = (bool *)state; - if (dest && (nir_dest_bit_size(*dest) == 64)) { + if (def && (def->bit_size == 64)) { *lower = true; return false; } @@ -1449,7 +1449,7 @@ filter_64_bit_instr(const nir_instr *const_instr, UNUSED const void *data) * doesn't have const variants, so do the ugly const_cast here. */ nir_instr *instr = (nir_instr *)const_instr; - nir_foreach_dest(instr, dest_is_64bit, &lower); + nir_foreach_def(instr, def_is_64bit, &lower); if (lower) return true; nir_foreach_src(instr, src_is_64bit, &lower); diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 3af38da..a83a0f7 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -231,10 +231,10 @@ st_nir_assign_uniform_locations(struct gl_context *ctx, } static bool -dest_is_64bit(nir_dest *dest, void *state) +def_is_64bit(nir_def *def, void *state) { bool *lower = (bool *)state; - if (dest && (nir_dest_bit_size(*dest) == 64)) { + if (def && (def->bit_size == 64)) { *lower = true; return false; } @@ -260,7 +260,7 @@ filter_64_bit_instr(const nir_instr *const_instr, UNUSED const void *data) * doesn't have const variants, so do the ugly const_cast here. */ nir_instr *instr = const_cast(const_instr); - nir_foreach_dest(instr, dest_is_64bit, &lower); + nir_foreach_def(instr, def_is_64bit, &lower); if (lower) return true; nir_foreach_src(instr, src_is_64bit, &lower); -- 2.7.4