From 9ddedf45540bc73d343db3dd7eadd0e165fe22c0 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sat, 8 Jul 2023 17:43:31 +0200 Subject: [PATCH] nir: rename intrinsic to have a more generic nameing Signed-off-by: Christian Gmeiner Reviewed-by: Alyssa Rosenzweig Part-of: --- src/compiler/nir/nir_intrinsics.py | 2 +- src/compiler/nir/nir_lower_tex.c | 2 +- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 4 ++-- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h | 2 +- src/gallium/drivers/vc4/vc4_program.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index ffa02de1fba..1f77528c922 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1009,7 +1009,7 @@ intrinsic("load_persp_center_rhw_ir3", dest_comp=1, # # Takes a sampler # and returns 1/size values for multiplying to normalize # texture coordinates. Used for lowering rect textures. -intrinsic("load_texture_rect_scaling", src_comp=[1], dest_comp=2, +intrinsic("load_texture_scale", src_comp=[1], dest_comp=2, flags=[CAN_ELIMINATE, CAN_REORDER]) # Fragment shader input interpolation delta intrinsic. diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c index 0b2427111a4..04666d676ea 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -235,7 +235,7 @@ lower_rect_tex_scale(nir_builder *b, nir_tex_instr *tex) b->cursor = nir_before_instr(&tex->instr); nir_ssa_def *idx = nir_imm_int(b, tex->texture_index); - nir_ssa_def *scale = nir_load_texture_rect_scaling(b, 32, idx); + nir_ssa_def *scale = nir_load_texture_scale(b, 32, idx); int coord_index = nir_tex_instr_src_index(tex, nir_tex_src_coord); if (coord_index != -1) { diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 29e538b0125..b70842f1090 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -371,7 +371,7 @@ get_src(struct etna_compile *c, nir_src *src) return (hw_src) { .use = 1, .rgroup = INST_RGROUP_INTERNAL }; case nir_intrinsic_load_frag_coord: return SRC_REG(0, INST_SWIZ_IDENTITY); - case nir_intrinsic_load_texture_rect_scaling: { + case nir_intrinsic_load_texture_scale: { int sampler = nir_src_as_int(intr->src[0]); nir_const_value values[] = { TEXSCALE(sampler, 0), @@ -600,7 +600,7 @@ emit_intrinsic(struct etna_compile *c, nir_intrinsic_instr * intr) break; case nir_intrinsic_load_input: case nir_intrinsic_load_instance_id: - case nir_intrinsic_load_texture_rect_scaling: + case nir_intrinsic_load_texture_scale: break; default: compile_error(c, "Unhandled NIR intrinsic type: %s\n", diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h index 08a93bfad92..5f720029fea 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h @@ -218,7 +218,7 @@ dest_for_instr(nir_instr *instr) intr->intrinsic == nir_intrinsic_load_ubo || intr->intrinsic == nir_intrinsic_load_input || intr->intrinsic == nir_intrinsic_load_instance_id || - intr->intrinsic == nir_intrinsic_load_texture_rect_scaling) + intr->intrinsic == nir_intrinsic_load_texture_scale) dest = &intr->dest; } break; case nir_instr_type_deref: diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 0639485c607..8043ba2139e 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -1853,7 +1853,7 @@ ntq_emit_intrinsic(struct vc4_compile *c, nir_intrinsic_instr *instr) break; } - case nir_intrinsic_load_texture_rect_scaling: { + case nir_intrinsic_load_texture_scale: { assert(nir_src_is_const(instr->src[0])); int sampler = nir_src_as_int(instr->src[0]);