diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2021-06-23 09:40:44 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-06-26 17:48:28 +0100 |
| commit | 807fac6371ef52b50734f2df45fb217d56ddbadb (patch) | |
| tree | d6e343e34f1ba59962a5ff115785c26705170beb | |
| parent | c884a02e25270ea41f78dd32f7b3408405a606fc (diff) | |
| download | mesa-807fac6371ef52b50734f2df45fb217d56ddbadb.tar.gz | |
zink: remove unused moltenvk functions
These functions were added, but never used. Let's get rid of them.
Fixes: c2cb2dd3bc6 ("zink: Added support for MacOS MoltenVK APIs.")
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11554>
(cherry picked from commit 95cbb560cf73ba60086b3c91d35ebcf577a95320)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/.pick_status.json b/.pick_status.json index 2546e1db299..3338a0773be 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -796,7 +796,7 @@ "description": "zink: remove unused moltenvk functions", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c2cb2dd3bc68d0d61fa483a3927563bab08c93e9" }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 7bbf1bc8d5d..3166bae4b26 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1261,11 +1261,7 @@ zink_internal_setup_moltenvk(struct zink_screen *screen) GET_PROC_ADDR_INSTANCE(GetMoltenVKConfigurationMVK); GET_PROC_ADDR_INSTANCE(SetMoltenVKConfigurationMVK); - - GET_PROC_ADDR_INSTANCE(GetPhysicalDeviceMetalFeaturesMVK); GET_PROC_ADDR_INSTANCE(GetVersionStringsMVK); - GET_PROC_ADDR_INSTANCE(UseIOSurfaceMVK); - GET_PROC_ADDR_INSTANCE(GetIOSurfaceMVK); if (screen->vk_GetVersionStringsMVK) { char molten_version[64] = {0}; diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h index 4a2e88d968c..3c7912d5a6b 100644 --- a/src/gallium/drivers/zink/zink_screen.h +++ b/src/gallium/drivers/zink/zink_screen.h @@ -139,11 +139,7 @@ struct zink_screen { #if defined(MVK_VERSION) PFN_vkGetMoltenVKConfigurationMVK vk_GetMoltenVKConfigurationMVK; PFN_vkSetMoltenVKConfigurationMVK vk_SetMoltenVKConfigurationMVK; - - PFN_vkGetPhysicalDeviceMetalFeaturesMVK vk_GetPhysicalDeviceMetalFeaturesMVK; PFN_vkGetVersionStringsMVK vk_GetVersionStringsMVK; - PFN_vkUseIOSurfaceMVK vk_UseIOSurfaceMVK; - PFN_vkGetIOSurfaceMVK vk_GetIOSurfaceMVK; #endif struct { |