From 38b92550224337bb81cc115b70b94a7c647d3075 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 26 May 2021 14:27:14 +1000 Subject: [PATCH] draw: fix tessellation output vertex size calculation This ensures space for the extra outputs is calculated in the tes vertex outputs. dEQP-VK.pipeline.misc.primitive_id_from_tess Fixes: dacf8f5f5c82 ("draw: hook up final bits of tessellation") Reviewed-by: Roland Scheidegger Part-of: (cherry picked from commit 45d9e8bb99ffb6ec5babec063e4665c323d56073) --- .pick_status.json | 2 +- src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);