From f1ff77686df24f0a50ec94553a9435e1e20da2e3 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 4 Feb 2021 11:57:31 +0000 Subject: [PATCH] graphics: Add _srt_graphics_get_vulkan_search_paths to internal header Signed-off-by: Simon McVittie <smcv@collabora.com> --- steam-runtime-tools/graphics-internal.h | 10 +++++++++ steam-runtime-tools/graphics.c | 28 ++++++++++++------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/steam-runtime-tools/graphics-internal.h b/steam-runtime-tools/graphics-internal.h index 55300797b..4ab5ac802 100644 --- a/steam-runtime-tools/graphics-internal.h +++ b/steam-runtime-tools/graphics-internal.h @@ -305,3 +305,13 @@ GList *_srt_dri_driver_get_from_report (JsonObject *json_obj); GList *_srt_va_api_driver_get_from_report (JsonObject *json_obj); GList *_srt_vdpau_driver_get_from_report (JsonObject *json_obj); GList *_srt_glx_icd_get_from_report (JsonObject *json_obj); + +G_GNUC_INTERNAL +gchar ** _srt_graphics_get_vulkan_search_paths (const char *sysroot, + gchar **envp, + const char * const *multiarch_tuples, + const char *suffix); + +#define _SRT_GRAPHICS_EXPLICIT_VULKAN_LAYER_SUFFIX "vulkan/explicit_layer.d" +#define _SRT_GRAPHICS_IMPLICIT_VULKAN_LAYER_SUFFIX "vulkan/implicit_layer.d" +#define _SRT_GRAPHICS_VULKAN_ICD_SUFFIX "vulkan/icd.d" diff --git a/steam-runtime-tools/graphics.c b/steam-runtime-tools/graphics.c index 075e61127..619250109 100644 --- a/steam-runtime-tools/graphics.c +++ b/steam-runtime-tools/graphics.c @@ -5588,8 +5588,6 @@ vulkan_icd_load_json_cb (const char *sysroot, vulkan_icd_load_json (sysroot, filename, user_data); } -#define VULKAN_ICD_SUFFIX "vulkan/icd.d" - /* * Return the ${sysconfdir} that we assume the Vulkan loader has. * See get_glvnd_sysconfdir(). @@ -5600,11 +5598,11 @@ get_vulkan_sysconfdir (void) return "/etc"; } -static gchar ** -get_vulkan_search_paths (const char *sysroot, - gchar **envp, - const char * const *multiarch_tuples, - const char *suffix) +gchar ** +_srt_graphics_get_vulkan_search_paths (const char *sysroot, + gchar **envp, + const char * const *multiarch_tuples, + const char *suffix) { GPtrArray *search_paths = g_ptr_array_new (); g_auto(GStrv) dirs = NULL; @@ -5748,8 +5746,10 @@ _srt_load_vulkan_icds (const char *sysroot, } else { - g_auto(GStrv) search_paths = get_vulkan_search_paths (sysroot, envp, multiarch_tuples, - VULKAN_ICD_SUFFIX); + g_auto(GStrv) search_paths = _srt_graphics_get_vulkan_search_paths (sysroot, + envp, + multiarch_tuples, + _SRT_GRAPHICS_VULKAN_ICD_SUFFIX); load_json_dirs (sysroot, search_paths, NULL, READDIR_ORDER, vulkan_icd_load_json_cb, &ret); } @@ -6516,9 +6516,6 @@ vulkan_layer_load_json_cb (const char *sysroot, vulkan_layer_load_json (sysroot, filename, user_data); } -#define EXPLICIT_VULKAN_LAYER_SUFFIX "vulkan/explicit_layer.d" -#define IMPLICIT_VULKAN_LAYER_SUFFIX "vulkan/implicit_layer.d" - /* * _srt_load_vulkan_layers: * @sysroot: (not nullable): The root directory, usually `/` @@ -6546,9 +6543,9 @@ _srt_load_vulkan_layers (const char *sysroot, g_return_val_if_fail (envp != NULL, NULL); if (explicit) - suffix = EXPLICIT_VULKAN_LAYER_SUFFIX; + suffix = _SRT_GRAPHICS_EXPLICIT_VULKAN_LAYER_SUFFIX; else - suffix = IMPLICIT_VULKAN_LAYER_SUFFIX; + suffix = _SRT_GRAPHICS_IMPLICIT_VULKAN_LAYER_SUFFIX; value = g_environ_getenv (envp, "VK_LAYER_PATH"); @@ -6564,7 +6561,8 @@ _srt_load_vulkan_layers (const char *sysroot, } else { - search_paths = get_vulkan_search_paths (sysroot, envp, NULL, suffix); + search_paths = _srt_graphics_get_vulkan_search_paths (sysroot, envp, + NULL, suffix); g_debug ("SEARCH PATHS %s", search_paths[0]); load_json_dirs (sysroot, search_paths, NULL, _srt_indirect_strcmp0, vulkan_layer_load_json_cb, &ret); -- GitLab