diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 58b18495a81..c7096197dd2 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -56,10 +56,6 @@ enum nir_spirv_execution_environment {
 struct spirv_to_nir_options {
    enum nir_spirv_execution_environment environment;
 
-   /* Whether to keep ViewIndex as an input instead of rewriting to a sysval.
-    */
-   bool view_index_is_input;
-
    /* Create a nir library. */
    bool create_library;
 
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 532e5e25459..53856a1595c 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1106,13 +1106,8 @@ vtn_get_builtin_location(struct vtn_builder *b,
       set_mode_system_value(b, mode);
       break;
    case SpvBuiltInViewIndex:
-      if (b->options && b->options->view_index_is_input) {
-         *location = VARYING_SLOT_VIEW_INDEX;
-         vtn_assert(*mode == nir_var_shader_in);
-      } else {
-         *location = SYSTEM_VALUE_VIEW_INDEX;
-         set_mode_system_value(b, mode);
-      }
+      *location = SYSTEM_VALUE_VIEW_INDEX;
+      set_mode_system_value(b, mode);
       break;
    case SpvBuiltInSubgroupEqMask:
       *location = SYSTEM_VALUE_SUBGROUP_EQ_MASK,