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

runtime: Rename some misleading variables


Paths derived from self->overrides are valid in the current execution
environment, but if we're running in a Flatpak environment, that's
not the host. Rename them accordingly.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 64a8d67a
No related branches found
No related tags found
1 merge request!195Rename misleading variables
......@@ -2408,14 +2408,14 @@ setup_vulkan_loadable_json (PvRuntime *self,
GError **error)
{
gsize i, j;
g_autofree gchar *dir_on_host = NULL;
g_autofree gchar *write_to_dir = NULL;
dir_on_host = g_build_filename (self->overrides,
write_to_dir = g_build_filename (self->overrides,
"share", "vulkan", sub_dir, NULL);
if (g_mkdir_with_parents (dir_on_host, 0700) != 0)
if (g_mkdir_with_parents (write_to_dir, 0700) != 0)
{
glnx_throw_errno_prefix (error, "Unable to create %s", dir_on_host);
glnx_throw_errno_prefix (error, "Unable to create %s", write_to_dir);
return FALSE;
}
......@@ -2451,7 +2451,7 @@ setup_vulkan_loadable_json (PvRuntime *self,
if (details->kinds[i] == ICD_KIND_ABSOLUTE)
{
g_autofree gchar *json_on_host = NULL;
g_autofree gchar *write_to_file = NULL;
g_autofree gchar *json_in_container = NULL;
g_autofree gchar *json_base = NULL;
......@@ -2459,7 +2459,7 @@ setup_vulkan_loadable_json (PvRuntime *self,
json_base = g_strdup_printf ("%" G_GSIZE_FORMAT "-%s.json",
j, multiarch_tuples[i]);
json_on_host = g_build_filename (dir_on_host, json_base, NULL);
write_to_file = g_build_filename (write_to_dir, json_base, NULL);
json_in_container = g_build_filename (self->overrides_in_container,
"share", "vulkan", sub_dir,
json_base, NULL);
......@@ -2470,7 +2470,7 @@ setup_vulkan_loadable_json (PvRuntime *self,
replacement = srt_vulkan_layer_new_replace_library_path (layer,
details->paths_in_container[i]);
if (!srt_vulkan_layer_write_to_file (replacement, json_on_host, error))
if (!srt_vulkan_layer_write_to_file (replacement, write_to_file, error))
return FALSE;
}
else
......@@ -2479,7 +2479,7 @@ setup_vulkan_loadable_json (PvRuntime *self,
replacement = srt_vulkan_icd_new_replace_library_path (icd,
details->paths_in_container[i]);
if (!srt_vulkan_icd_write_to_file (replacement, json_on_host, error))
if (!srt_vulkan_icd_write_to_file (replacement, write_to_file, error))
return FALSE;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment