Skip to content
Snippets Groups Projects
Commit d9d6ba9a authored by Ludovico de Nittis's avatar Ludovico de Nittis
Browse files

Merge branch 'wip/smcv/refactor-runtime' into 'master'

runtime: Combine multiple runs of capsule-capture-libs into one

See merge request steam/pressure-vessel!34
parents d0e1b5c1 3471911a
No related branches found
No related tags found
No related merge requests found
...@@ -1218,7 +1218,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1218,7 +1218,7 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
g_mkdir_with_parents (libdir_on_host, 0755); g_mkdir_with_parents (libdir_on_host, 0755);
g_mkdir_with_parents (this_dri_path_on_host, 0755); g_mkdir_with_parents (this_dri_path_on_host, 0755);
g_debug ("Collecting GLX drivers from host system..."); g_debug ("Collecting graphics drivers from host system...");
temp_bwrap = pv_bwrap_copy (self->container_access_adverb); temp_bwrap = pv_bwrap_copy (self->container_access_adverb);
flatpak_bwrap_add_args (temp_bwrap, flatpak_bwrap_add_args (temp_bwrap,
...@@ -1227,22 +1227,11 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1227,22 +1227,11 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
"--link-target", "/run/host", "--link-target", "/run/host",
"--dest", libdir_on_host, "--dest", libdir_on_host,
"--provider", "/", "--provider", "/",
/* Mesa GLX, etc. */
"gl:", "gl:",
NULL); /* Vulkan */
flatpak_bwrap_finish (temp_bwrap); "if-exists:if-same-abi:soname:libvulkan.so.1",
/* NVIDIA proprietary stack */
if (!pv_bwrap_run_sync (temp_bwrap, NULL, error))
return FALSE;
g_clear_pointer (&temp_bwrap, flatpak_bwrap_free);
temp_bwrap = pv_bwrap_copy (self->container_access_adverb);
flatpak_bwrap_add_args (temp_bwrap,
tool_path,
"--container", self->container_access,
"--link-target", "/run/host",
"--dest", libdir_on_host,
"--provider", "/",
"if-exists:even-if-older:soname-match:libEGL.so.*", "if-exists:even-if-older:soname-match:libEGL.so.*",
"if-exists:even-if-older:soname-match:libEGL_nvidia.so.*", "if-exists:even-if-older:soname-match:libEGL_nvidia.so.*",
"if-exists:even-if-older:soname-match:libGL.so.*", "if-exists:even-if-older:soname-match:libGL.so.*",
...@@ -1314,22 +1303,6 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self, ...@@ -1314,22 +1303,6 @@ pv_runtime_use_host_graphics_stack (PvRuntime *self,
g_debug ("Collecting %s Vulkan drivers from host system...", g_debug ("Collecting %s Vulkan drivers from host system...",
multiarch_tuples[i]); multiarch_tuples[i]);
temp_bwrap = pv_bwrap_copy (self->container_access_adverb);
flatpak_bwrap_add_args (temp_bwrap,
tool_path,
"--container", self->container_access,
"--link-target", "/run/host",
"--dest", libdir_on_host,
"--provider", "/",
"if-exists:if-same-abi:soname:libvulkan.so.1",
NULL);
flatpak_bwrap_finish (temp_bwrap);
if (!pv_bwrap_run_sync (temp_bwrap, NULL, error))
return FALSE;
g_clear_pointer (&temp_bwrap, flatpak_bwrap_free);
for (j = 0; j < vulkan_icd_details->len; j++) for (j = 0; j < vulkan_icd_details->len; j++)
{ {
IcdDetails *details = g_ptr_array_index (vulkan_icd_details, j); IcdDetails *details = g_ptr_array_index (vulkan_icd_details, j);
......
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