fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: rename intrinsic to have a more generic nameing

Browse source 
Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24054>
This commit is contained in:
Christian Gmeiner 2023-07-08 17:43:31 +02:00 • committed by Marge Bot
parent dd81c03ab1
commit 9ddedf4554
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/nir/nir_intrinsics.py
View file

@ -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.

2
src/compiler/nir/nir_lower_tex.c
View file

@ -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) {

4
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
View file

@ -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",

2
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h
View file

@ -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:

2
src/gallium/drivers/vc4/vc4_program.c
View file

@ -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]);