From 6ae28c43dc4e3088c7f8fa8aada1e2dba16c6ed0 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 23 Feb 2022 11:35:52 +1000 Subject: [PATCH] draw/so: don't use pre clip pos if we have a tes either. This check for geom shader needed to be expanded for tess support. dEQP-VK.transform_feedback.simple.depth_clip_control_tese with lvp Fixes: dacf8f5f5c82 ("draw: hook up final bits of tessellation") Acked-by: Mike Blumenkrantz Part-of: (cherry picked from commit b77ef4dd60d1d8fad0cb4d50740f1b8afc9e02f9) --- .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 639bd6f4c54..ec356ae451e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4720,7 +4720,7 @@ "description": "draw/so: don't use pre clip pos if we have a tes either.", "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 ee804003c63..8abed870340 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 @@ -316,7 +316,7 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, draw->rasterizer->clip_halfz, (draw->vs.edgeflag_output ? TRUE : FALSE) ); - draw_pt_so_emit_prepare( fpme->so_emit, gs == NULL ); + draw_pt_so_emit_prepare( fpme->so_emit, (gs == NULL && tes == NULL)); if (!(opt & PT_PIPELINE)) { draw_pt_emit_prepare( fpme->emit, out_prim,