From 1cfb84c06014ece83c0acf8b59a38360d501f91e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 17 Mar 2026 16:04:32 +1000 Subject: [PATCH] st/mesh: handle mesh shader point size This sets the per-vertex point size state correctly in the presence of mesh shaders. (fixes line is just a educated pick) Fixes: 51d6e4404aeb ("mesa: allow NULL for vertex shader when mesh pipeline") Reviewed-by: Mike Blumenkrantz (cherry picked from commit 5bfaf7536ad70d922e8849cdd95c3742556fe01a) Part-of: --- .pick_status.json | 2 +- src/mesa/state_tracker/st_util.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index b1ec55a9c80..ff803335f1b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6374,7 +6374,7 @@ "description": "st/mesh: handle mesh shader point size", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "51d6e4404aeb3a8e3c7eeb39584d590099a17402", "notes": null diff --git a/src/mesa/state_tracker/st_util.h b/src/mesa/state_tracker/st_util.h index f8381e80eb3..9958ea8eab4 100644 --- a/src/mesa/state_tracker/st_util.h +++ b/src/mesa/state_tracker/st_util.h @@ -104,6 +104,14 @@ st_point_size_per_vertex(struct gl_context *ctx) VARYING_BIT_PSIZ); } } + const struct gl_program *meshProg = ctx->MeshProgram._Current; + if (meshProg) { + if (meshProg->info.outputs_written & + VARYING_BIT_PSIZ) { + /* generated program which emits point size */ + return true; + } + } return false; }