From: Dave Airlie <airlied@redhat.com>
Date: Wed, 26 May 2021 04:27:14 +0000 (+1000)
Subject: draw: fix tessellation output vertex size calculation
X-Git-Tag: upstream/21.2.3~989
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45d9e8bb99ffb6ec5babec063e4665c323d56073;p=platform%2Fupstream%2Fmesa.git

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 <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11000>
---

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 9c0207a..421af23 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);