nir: Add a nir_foreach_uniform_variable helper
[mesa.git] / src / mesa / drivers / dri / i965 / brw_nir_uniforms.cpp
index 639bdfc0f2cbe1750dc78200367e2d51d87e3b77..25df2cf5b2704a91432bb6360a5dae27df877a29 100644 (file)
@@ -222,7 +222,7 @@ brw_nir_setup_glsl_uniforms(void *mem_ctx, nir_shader *shader,
    stage_prog_data->nr_params = nr_params;
    stage_prog_data->param = rzalloc_array(mem_ctx, uint32_t, nr_params);
 
-   nir_foreach_variable(var, &shader->uniforms) {
+   nir_foreach_uniform_variable(var, shader) {
       /* UBO's, atomics and samplers don't take up space in the
          uniform file */
       if (var->interface_type != NULL || var->type->contains_atomic())
@@ -306,7 +306,7 @@ brw_nir_lower_gl_images(nir_shader *shader,
                         const struct gl_program *prog)
 {
    /* We put image uniforms at the end */
-   nir_foreach_variable(var, &shader->uniforms) {
+   nir_foreach_uniform_variable(var, shader) {
       if (!var->type->contains_image())
          continue;