diff --git a/.pick_status.json b/.pick_status.json
index 94f67c1f659..a6477fbdbd6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3982,7 +3982,7 @@
         "description": "draw: fix tessellation output vertex size calculation",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "dacf8f5f5c82c18e841050af37db54ca21c026ee"
     },
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
index fe1734a9a37..6a5033e485c 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
@@ -265,7 +265,7 @@ llvm_middle_end_prepare_tes(struct llvm_middle_end *fpme)
          }
       }
 
-      variant = draw_tes_llvm_create_variant(llvm, tes->info.num_outputs, key);
+      variant = draw_tes_llvm_create_variant(llvm, draw_total_tes_outputs(draw), key);
 
       if (variant) {
          insert_at_head(&shader->variants, &variant->list_item_local);