diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 47691a5926ae907665ed461fd85bf19bf99aa52f..3fa64a3ddf09d9c7f10a5d1de7c32a309fd5b9dd 100644
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -827,7 +827,7 @@ static nir_ssa_def *
 build_addr_for_var(nir_builder *b, nir_variable *var,
                    nir_address_format addr_format)
 {
-   assert(var->data.mode & (nir_var_shader_in | nir_var_mem_shared |
+   assert(var->data.mode & (nir_var_uniform | nir_var_mem_shared |
                             nir_var_shader_temp | nir_var_function_temp |
                             nir_var_mem_constant));
 
@@ -977,7 +977,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin,
       assert(addr_format_is_global(addr_format));
       op = nir_intrinsic_load_global;
       break;
-   case nir_var_shader_in:
+   case nir_var_uniform:
       assert(addr_format_is_offset(addr_format));
       op = nir_intrinsic_load_kernel_input;
       break;
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 8da6724e34c116e40703c086efbba8f8a452aedc..143e3273dd95158a390d0495672e5afac1c9e8e8 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -5454,7 +5454,7 @@ vtn_emit_kernel_entry_point_wrapper(struct vtn_builder *b,
 
       /* input variable */
       nir_variable *in_var = rzalloc(b->nb.shader, nir_variable);
-      in_var->data.mode = nir_var_shader_in;
+      in_var->data.mode = nir_var_uniform;
       in_var->data.read_only = true;
       in_var->data.location = i;
       if (param_type->base_type == vtn_base_type_image) {
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 365cdbefec87df02c6ae6df08c2dee01f41f6219..0de23e9d389a1cfa6ef0374906ab62a48116f007 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -2631,12 +2631,12 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
       ptr_type = rzalloc(b, struct vtn_type);
       ptr_type->base_type = vtn_base_type_pointer;
       ptr_type->deref = sampler_type;
-      ptr_type->storage_class = SpvStorageClassUniform;
+      ptr_type->storage_class = SpvStorageClassUniformConstant;
 
       ptr_type->type = nir_address_format_to_glsl_type(
          vtn_mode_to_address_format(b, vtn_variable_mode_function));
 
-      vtn_create_variable(b, val, ptr_type, ptr_type->storage_class, NULL, NULL);
+      vtn_create_variable(b, val, ptr_type, SpvStorageClassUniform, NULL, NULL);
 
       nir_variable *nir_var = val->pointer->var->var;
       nir_var->data.sampler.is_inline_sampler = true;