Skip to content
Snippets Groups Projects
Commit 4bc0958b authored by Simon McVittie's avatar Simon McVittie
Browse files

runtime: Rename another misleading variable


srt_vulkan_layer_get_json_path() and srt_vulkan_icd_get_json_path()
return paths relative to the SrtSystemInfo's sysroot (the graphics driver
provider), which might be the root filesystem, but might equally be
/run/host when we're running inside Flatpak. Rename this variable
accordingly.

We were already using it correctly: the third argument to
pv_runtime_take_from_provider() is a path in the provider sysroot.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent fc314c8c
Branches
Tags
1 merge request!195Rename misleading variables
Pipeline #5946 passed
This commit is part of merge request !196. Comments created here will be created in the context of that merge request.
......@@ -2497,11 +2497,11 @@ setup_vulkan_loadable_json (PvRuntime *self,
{
g_autofree gchar *json_in_container = NULL;
g_autofree gchar *json_base = NULL;
const char *json_on_host = NULL;
const char *json_in_provider = NULL;
if (layer != NULL)
json_on_host = srt_vulkan_layer_get_json_path (layer);
json_in_provider = srt_vulkan_layer_get_json_path (layer);
else
json_on_host = srt_vulkan_icd_get_json_path (icd);
json_in_provider = srt_vulkan_icd_get_json_path (icd);
json_base = g_strdup_printf ("%" G_GSIZE_FORMAT ".json", j);
json_in_container = g_build_filename (self->overrides_in_container,
......@@ -2509,7 +2509,7 @@ setup_vulkan_loadable_json (PvRuntime *self,
json_base, NULL);
if (!pv_runtime_take_from_provider (self, bwrap,
json_on_host,
json_in_provider,
json_in_container,
TAKE_FROM_PROVIDER_FLAGS_COPY_FALLBACK,
error))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment