nir: make nir_const_value scalar

v2: remove & operator in a couple of memsets
    add some memsets
v3: fixup lima

Signed-off-by: Karol Herbst <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]> (v2)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c b/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c
index 1dcaa315124..2849e569f01 100644
--- a/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c
+++ b/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c
@@ -76,15 +76,15 @@ lower_tex_src_plane_block(lower_tex_src_state *state, nir_block *block)
       nir_const_value *plane = nir_src_as_const_value(tex->src[plane_index].src);
       assume(plane);
 
-      if (plane->i32[0] > 0) {
+      if (plane[0].i32 > 0) {
          unsigned y_samp = tex->texture_index;
 
          assume(tex->texture_index == tex->sampler_index);
-         assume(((state->lower_3plane & (1 << y_samp)) && plane->i32[0] < 3) ||
-               (plane->i32[0] < 2));
+         assume(((state->lower_3plane & (1 << y_samp)) && plane[0].i32 < 3) ||
+               (plane[0].i32 < 2));
 
          tex->texture_index = tex->sampler_index =
-               state->sampler_map[y_samp][plane->i32[0] - 1];
+               state->sampler_map[y_samp][plane[0].i32 - 1];
       }
 
       nir_tex_instr_remove_src(tex, plane_index);