From ae34f04d74837fcc949ece1900e439cec397ced6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Mar 2024 09:40:36 -0500 Subject: [PATCH] zink: fix PIPE_CAP_MAX_SHADER_PATCH_VARYINGS maxTessellationControlPerPatchOutputComponents is the per-patch limit, maxTessellationControlPerVertexOutputComponents is the per-vertex limit fixes #10750 cc: mesa-stable Part-of: (cherry picked from commit 0736c212b537fb1595fa93373ccc113ab44bcba2) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fa43cc81d21..903437b2910 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1074,7 +1074,7 @@ "description": "zink: fix PIPE_CAP_MAX_SHADER_PATCH_VARYINGS", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 268f9b53c98..ccbbf808d85 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1007,7 +1007,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 0; case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: - return screen->info.props.limits.maxTessellationControlPerVertexOutputComponents / 4; + return screen->info.props.limits.maxTessellationControlPerPatchOutputComponents / 4; case PIPE_CAP_MAX_VARYINGS: /* need to reserve up to 60 of our varying components and 16 slots for streamout */ return MIN2(screen->info.props.limits.maxVertexOutputComponents / 4 / 2, 16);