AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Drop "SSA" from NIR language

Browse Source 
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>
This commit is contained in:
Alyssa Rosenzweig
2023-08-12 16:17:15 -04:00
parent 777d336b1f
commit 09d31922de
492 changed files with 10408 additions and 10455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_drawpixels.c
+10 -10
View File
@@ -37,7 +37,7 @@ typedef struct {
nir_variable *texcoord, *texcoord_const, *scale, *bias, *tex, *pixelmap;
} lower_drawpixels_state;
static nir_ssa_def *
static nir_def *
get_texcoord(nir_builder *b, lower_drawpixels_state *state)
{
if (state->texcoord == NULL) {
@@ -47,7 +47,7 @@ get_texcoord(nir_builder *b, lower_drawpixels_state *state)
return nir_load_var(b, state->texcoord);
}
static nir_ssa_def *
static nir_def *
get_scale(nir_builder *b, lower_drawpixels_state *state)
{
if (state->scale == NULL) {
@@ -57,7 +57,7 @@ get_scale(nir_builder *b, lower_drawpixels_state *state)
return nir_load_var(b, state->scale);
}
static nir_ssa_def *
static nir_def *
get_bias(nir_builder *b, lower_drawpixels_state *state)
{
if (state->bias == NULL) {
@@ -67,7 +67,7 @@ get_bias(nir_builder *b, lower_drawpixels_state *state)
return nir_load_var(b, state->bias);
}
static nir_ssa_def *
static nir_def *
get_texcoord_const(nir_builder *b, lower_drawpixels_state *state)
{
if (state->texcoord_const == NULL) {
@@ -81,9 +81,9 @@ get_texcoord_const(nir_builder *b, lower_drawpixels_state *state)
static bool
lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr *intr)
{
nir_ssa_def *texcoord;
nir_def *texcoord;
nir_tex_instr *tex;
nir_ssa_def *def;
nir_def *def;
b->cursor = nir_before_instr(&intr->instr);
@@ -141,7 +141,7 @@ lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr *
nir_build_deref_var(b, state->pixelmap);
/* do four pixel map look-ups with two TEX instructions: */
nir_ssa_def *def_xy, *def_zw;
nir_def *def_xy, *def_zw;
/* TEX def.xy, def.xyyy, pixelmap_sampler, 2D; */
tex = nir_tex_instr_create(state->shader, 3);
@@ -184,7 +184,7 @@ lower_color(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_instr *
nir_channel(b, def_zw, 1));
}
nir_ssa_def_rewrite_uses(&intr->dest.ssa, def);
nir_def_rewrite_uses(&intr->dest.ssa, def);
return true;
}
@@ -193,8 +193,8 @@ lower_texcoord(nir_builder *b, lower_drawpixels_state *state, nir_intrinsic_inst
{
b->cursor = nir_before_instr(&intr->instr);
nir_ssa_def *texcoord_const = get_texcoord_const(b, state);
nir_ssa_def_rewrite_uses(&intr->dest.ssa, texcoord_const);
nir_def *texcoord_const = get_texcoord_const(b, state);
nir_def_rewrite_uses(&intr->dest.ssa, texcoord_const);
return true;
}