From 59865a1b1e2706c2048d965671685ac7d8214db3 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Wed, 22 Jan 2025 15:38:40 +0800 Subject: [PATCH] lavapipe: fix min_vertex_pipeline_param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: d91a549b67f ("lavapipe: check all vertex-stages") Reviewed-by: Alyssa Rosenzweig Acked-by: Marek Olšák Part-of: (cherry picked from commit 0f656756ec225cbd266e5de6e11f25b49afad64b) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a71707d1427..120606c87f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1404,7 +1404,7 @@ "description": "lavapipe: fix min_vertex_pipeline_param", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d91a549b67f3a13c4763d82e333e50395c300507", "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 2f1c28a3856..934c501e231 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -304,7 +304,7 @@ min_vertex_pipeline_param(struct pipe_screen *pscreen, enum pipe_shader_cap para PIPE_SHADER_CAP_MAX_INSTRUCTIONS)) continue; - val = MAX2(val, pscreen->get_shader_param(pscreen, i, param)); + val = MIN2(val, pscreen->get_shader_param(pscreen, i, param)); } return val; }