summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nouveau/nv50/nv50_surface.c
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@rosenzweig.io>2023-08-12 16:17:15 -0400
committerAlyssa Rosenzweig <alyssa@rosenzweig.io>2023-08-12 16:44:41 -0400
commit09d31922dee2483313fc09cefe8eb7cd7296a2c8 (patch)
treed2d863afc896d8ce161aaea9ce5ad181700ac35f /src/gallium/drivers/nouveau/nv50/nv50_surface.c
parent777d336b1ffe6b1ab4aec16ef32d71b9ad62f51f (diff)
nir: Drop "SSA" from NIR language
Everything is SSA now. sed -e 's/nir_ssa_def/nir_def/g' \ -e 's/nir_ssa_undef/nir_undef/g' \ -e 's/nir_ssa_scalar/nir_scalar/g' \ -e 's/nir_src_rewrite_ssa/nir_src_rewrite/g' \ -e 's/nir_gather_ssa_types/nir_gather_types/g' \ -i $(git grep -l nir | grep -v relnotes) git mv src/compiler/nir/nir_gather_ssa_types.c \ src/compiler/nir/nir_gather_types.c ninja -C build/ clang-format cd src/compiler/nir && find *.c *.h -type f -exec clang-format -i \{} \; Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com> Acked-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24585>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50/nv50_surface.c')
-rw-r--r--src/gallium/drivers/nouveau/nv50/nv50_surface.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
index b8b07ccaca8..faadab176f2 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
@@ -877,7 +877,7 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
coord_var->data.location = VARYING_SLOT_VAR0;
coord_var->data.interpolation = INTERP_MODE_NOPERSPECTIVE;
- nir_ssa_def *coord = nir_load_var(&b, coord_var);
+ nir_def *coord = nir_load_var(&b, coord_var);
if (ptarg == PIPE_TEXTURE_1D_ARRAY) {
/* Adjust coordinates. Depth is in z, but TEX expects it to be in y. */
coord = nir_channels(&b, coord, TGSI_WRITEMASK_XZ);
@@ -891,7 +891,7 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
const struct glsl_type *sampler_type =
glsl_sampler_type(sampler_dim, false, is_array, GLSL_TYPE_FLOAT);
- nir_ssa_def *s = NULL;
+ nir_def *s = NULL;
if (tex_s) {
nir_variable *sampler =
nir_variable_create(b.shader, nir_var_uniform,
@@ -904,7 +904,7 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
s = nir_channel(&b, s, 0);
}
- nir_ssa_def *rgba = NULL, *z = NULL;
+ nir_def *rgba = NULL, *z = NULL;
if (tex_rgbaz) {
nir_variable *sampler =
nir_variable_create(b.shader, nir_var_uniform,
@@ -923,14 +923,14 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
}
/* handle conversions */
- nir_ssa_def *out_ssa;
+ nir_def *out_ssa;
nir_component_mask_t out_mask = 0;
if (cvt_un8) {
if (tex_s) {
s = nir_i2f32(&b, s);
s = nir_fmul_imm(&b, s, 1.0f / 0xff);
} else {
- s = nir_ssa_undef(&b, 1, 32);
+ s = nir_undef(&b, 1, 32);
}
if (tex_rgbaz) {
@@ -944,7 +944,7 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
1.0f / 0x00ff00,
1.0f / 0xff0000));
} else {
- z = nir_ssa_undef(&b, 3, 32);
+ z = nir_undef(&b, 3, 32);
}
if (mode == NV50_BLIT_MODE_Z24S8 ||
@@ -973,8 +973,8 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
out_ssa = rgba;
out_mask |= TGSI_WRITEMASK_XYZW;
} else {
- out_ssa = nir_vec2(&b, z ? z : nir_ssa_undef(&b, 1, 32),
- s ? s : nir_ssa_undef(&b, 1, 32));
+ out_ssa = nir_vec2(&b, z ? z : nir_undef(&b, 1, 32),
+ s ? s : nir_undef(&b, 1, 32));
if (tex_rgbaz) out_mask |= TGSI_WRITEMASK_X;
if (tex_s) out_mask |= TGSI_WRITEMASK_Y;
}