summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2022-02-23 11:35:52 +1000
committerDylan Baker <dylan.c.baker@intel.com>2022-02-25 13:09:36 -0800
commit23032ee9dbb659e63ae6a3d4145f41c21c1159a8 (patch)
tree8c770394f02c85f00dfa59b8f0742944cbafd4e4
parent94f5c307cb082fb30958e45ec994aca61d998256 (diff)
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 <michael.blumenkrantz@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15128> (cherry picked from commit b77ef4dd60d1d8fad0cb4d50740f1b8afc9e02f9)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 29b9da7b623..7d43eeac737 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -616,7 +616,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,