From 9dca8146b2ce7a4e0848986f8a1793a7d6a12382 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 11 Apr 2026 22:03:59 -0700 Subject: [PATCH] zink: remove unused variable in zink_instance.py src/gallium/drivers/zink/zink_instance.c:34:9: warning: variable 'have_moltenvk_layer' set but not used [-Wunused-but-set-variable] Fixes: 2b4fcf0a063f32d7000e9f4c6b8e398867d3b21c ("zink: generate instance creation code with a python script") Signed-off-by: Vinson Lee (cherry picked from commit 5982deb48b90264dd7644525f40dbd89ae5b6344) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_instance.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c39fd1212a2..92816b8d152 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5994,7 +5994,7 @@ "description": "zink: remove unused variable in zink_instance.py", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2b4fcf0a063f32d7000e9f4c6b8e398867d3b21c", "notes": null diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py index cfcfe2cb0c7..234d0ec02cd 100755 --- a/src/gallium/drivers/zink/zink_instance.py +++ b/src/gallium/drivers/zink/zink_instance.py @@ -151,10 +151,6 @@ zink_create_instance(struct zink_screen *screen, struct zink_instance_info *inst bool have_layer_${layer.pure_name()} = false; %endfor -#if defined(MVK_VERSION) - bool have_moltenvk_layer = false; -#endif - GET_PROC_ADDR_INSTANCE_LOCAL(screen, NULL, EnumerateInstanceExtensionProperties); GET_PROC_ADDR_INSTANCE_LOCAL(screen, NULL, EnumerateInstanceLayerProperties); if (!vk_EnumerateInstanceExtensionProperties || @@ -206,7 +202,6 @@ zink_create_instance(struct zink_screen *screen, struct zink_instance_info *inst %endfor #if defined(MVK_VERSION) if (!strcmp(layer_props[i].layerName, "MoltenVK")) { - have_moltenvk_layer = true; layers[num_layers++] = "MoltenVK"; } #endif