diff --git a/.pick_status.json b/.pick_status.json
index 59e19f036a2..544d5ddcc45 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -499,7 +499,7 @@
         "description": "ttn: Set nir->info.separate_shader",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 3823089719e..ad1839658c9 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -2326,6 +2326,9 @@ ttn_compile_init(const void *tgsi_tokens,
    s->info.num_textures = util_last_bit(scan.samplers_declared);
    s->info.internal = false;
 
+   /* Default for TGSI is separate, this is assumed throughout the tree */
+   s->info.separate_shader = true;
+
    for (unsigned i = 0; i < TGSI_PROPERTY_COUNT; i++) {
       unsigned value = scan.properties[i];