diff --git a/src/panfrost/compiler/bifrost/bifrost_compile.c b/src/panfrost/compiler/bifrost/bifrost_compile.c
index 7784ba6debb..2f9d3e4d1f0 100644
--- a/src/panfrost/compiler/bifrost/bifrost_compile.c
+++ b/src/panfrost/compiler/bifrost/bifrost_compile.c
@@ -5726,7 +5726,7 @@ bifrost_optimize_nir(nir_shader *nir, unsigned gpu_id)
 }
 
 static void
-bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust2_modes)
+bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust_modes)
 {
    NIR_PASS(_, nir, nir_opt_shrink_stores, true);
    bi_optimize_loop_nir(nir, gpu_id, false);
@@ -5739,7 +5739,7 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust2_mode
                nir_var_mem_ubo |
                nir_var_shader_temp,
       .callback = mem_vectorize_cb,
-      .robust_modes = robust2_modes,
+      .robust_modes = robust_modes,
    };
    NIR_PASS(_, nir, nir_opt_load_store_vectorize, &vectorize_opts);
 
@@ -6963,7 +6963,7 @@ bifrost_compile_shader_nir(nir_shader *nir,
       NIR_PASS(_, nir, pan_nir_lower_fs_outputs, skip_atest);
    }
 
-   bi_optimize_nir(nir, inputs->gpu_id, inputs->robust2_modes);
+   bi_optimize_nir(nir, inputs->gpu_id, inputs->robust_modes);
 
    {
       bool scalar_phis_pass = false;
diff --git a/src/panfrost/compiler/pan_compiler.h b/src/panfrost/compiler/pan_compiler.h
index cb9702678c9..fad6affc740 100644
--- a/src/panfrost/compiler/pan_compiler.h
+++ b/src/panfrost/compiler/pan_compiler.h
@@ -108,7 +108,7 @@ struct pan_compile_inputs {
    bool no_idvs;
    uint32_t view_mask;
 
-   nir_variable_mode robust2_modes;
+   nir_variable_mode robust_modes;
    /* Whether or not descriptor accesses should add additional robustness
     * checks. */
    bool robust_descriptors;
diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c
index be9cd3e0851..265b27f2fdb 100644
--- a/src/panfrost/vulkan/panvk_vX_shader.c
+++ b/src/panfrost/vulkan/panvk_vX_shader.c
@@ -1266,17 +1266,17 @@ panvk_compile_shader(struct panvk_device *dev,
    if (shader == NULL)
       return panvk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
 
-   nir_variable_mode robust2_modes = 0;
-   if (info->robustness->uniform_buffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT)
-      robust2_modes |= nir_var_mem_ubo;
-   if (info->robustness->storage_buffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT)
-      robust2_modes |= nir_var_mem_ssbo;
+   nir_variable_mode robust_modes = 0;
+   if (info->robustness->uniform_buffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT)
+      robust_modes |= nir_var_mem_ubo;
+   if (info->robustness->storage_buffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT)
+      robust_modes |= nir_var_mem_ssbo;
 
    struct pan_compile_inputs inputs = {
       .gpu_id = phys_dev->kmod.dev->props.gpu_id,
       .gpu_variant = phys_dev->kmod.dev->props.gpu_variant,
       .view_mask = (state && state->rp) ? state->mv->view_mask : 0,
-      .robust2_modes = robust2_modes,
+      .robust_modes = robust_modes,
       .robust_descriptors = dev->vk.enabled_features.nullDescriptor,
    };