X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fnir%2Fnir_lower_io.c;h=e0ba9347bfe3b6abed4a06896cf5638b92fc257f;hb=c81ca60b41db4632237dc5facfe4e37e500a840a;hp=369a8ee537ed7d6a24ec16eb168ea5aeaca94840;hpb=12f88ba32a14ea79134f4e995a55149f078a2f27;p=mesa.git

diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 369a8ee537e..e0ba9347bfe 100644
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -211,10 +211,9 @@ atomic_op(nir_intrinsic_op opcode)
 }
 
 static bool
-nir_lower_io_block(nir_block *block, void *void_state)
+nir_lower_io_block(nir_block *block,
+                   struct lower_io_state *state)
 {
-   struct lower_io_state *state = void_state;
-
    nir_builder *b = &state->builder;
 
    nir_foreach_instr_safe(block, instr) {
@@ -278,8 +277,8 @@ nir_lower_io_block(nir_block *block, void *void_state)
             intrin->variables[0]->var->data.driver_location);
 
          if (load->intrinsic == nir_intrinsic_load_uniform) {
-            load->const_index[1] =
-               state->type_size(intrin->variables[0]->var->type);
+            nir_intrinsic_set_range(load,
+               state->type_size(intrin->variables[0]->var->type));
          }
 
          if (per_vertex)
@@ -403,7 +402,9 @@ nir_lower_io_impl(nir_function_impl *impl,
    state.modes = modes;
    state.type_size = type_size;
 
-   nir_foreach_block(impl, nir_lower_io_block, &state);
+   nir_foreach_block(block, impl) {
+      nir_lower_io_block(block, &state);
+   }
 
    nir_metadata_preserve(impl, nir_metadata_block_index |
                                nir_metadata_dominance);