diff --git a/.pick_status.json b/.pick_status.json
index 7dfecf58afa..979664d6ceb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -734,7 +734,7 @@
         "description": "spirv: add an options to lower SpvOpTerminateInvocation to OpKill",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 7de81d7267f..556059d9079 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -133,6 +133,11 @@ struct spirv_to_nir_options {
    /* Force SSBO accesses to be non-uniform. */
    bool force_ssbo_non_uniform;
 
+   /* Whether OpTerminateInvocation should be lowered to OpKill to workaround
+    * game bugs.
+    */
+   bool lower_terminate_to_discard;
+
    /* In Debug Builds, instead of emitting an OS break on failure, just return NULL from
     * spirv_to_nir().  This is useful for the unit tests that want to report a test failed
     * but continue executing other tests.
diff --git a/src/compiler/spirv/vtn_structured_cfg.c b/src/compiler/spirv/vtn_structured_cfg.c
index cbd2676e46a..3224e7a99be 100644
--- a/src/compiler/spirv/vtn_structured_cfg.c
+++ b/src/compiler/spirv/vtn_structured_cfg.c
@@ -976,7 +976,10 @@ branch_type_for_terminator(struct vtn_builder *b, struct vtn_block *block)
    case SpvOpKill:
       return vtn_branch_type_discard;
    case SpvOpTerminateInvocation:
-      return vtn_branch_type_terminate_invocation;
+      if (b->options->lower_terminate_to_discard)
+         return vtn_branch_type_discard;
+      else
+         return vtn_branch_type_terminate_invocation;
    case SpvOpIgnoreIntersectionKHR:
       return vtn_branch_type_ignore_intersection;
    case SpvOpTerminateRayKHR: