Skip to content
Snippets Groups Projects
Commit 681422fe authored by Ludovico de Nittis's avatar Ludovico de Nittis :palm_tree:
Browse files

runtime: Add warning if $PLATFORM expansion cannot be detected

parent 561629f9
No related branches found
No related tags found
1 merge request!297Add support to detect the expansion of $LIB and $PLATFORM
...@@ -4596,6 +4596,7 @@ pv_runtime_use_provider_graphics_stack (PvRuntime *self, ...@@ -4596,6 +4596,7 @@ pv_runtime_use_provider_graphics_stack (PvRuntime *self,
g_autofree gchar *libdrm = NULL; g_autofree gchar *libdrm = NULL;
g_autofree gchar *libdrm_amdgpu = NULL; g_autofree gchar *libdrm_amdgpu = NULL;
g_autofree gchar *libglx_mesa = NULL; g_autofree gchar *libglx_mesa = NULL;
g_autofree gchar *platform_token = NULL;
g_autoptr(GPtrArray) patterns = NULL; g_autoptr(GPtrArray) patterns = NULL;
if (!pv_runtime_get_ld_so (self, arch, &ld_so_in_runtime, error)) if (!pv_runtime_get_ld_so (self, arch, &ld_so_in_runtime, error))
...@@ -4769,6 +4770,17 @@ pv_runtime_use_provider_graphics_stack (PvRuntime *self, ...@@ -4769,6 +4770,17 @@ pv_runtime_use_provider_graphics_stack (PvRuntime *self,
platform_link, arch->details->tuple); platform_link, arch->details->tuple);
} }
platform_token = srt_system_info_dup_libdl_platform (system_info,
multiarch_tuples[i],
&local_error);
if (platform_token == NULL)
{
/* This is not a critical error, try to continue */
g_warning ("The dynamic linker expansion of \"$PLATFORM\" is not what we "
"expected, VDPAU drivers might not work: %s", local_error->message);
g_clear_error (&local_error);
}
if (!pv_runtime_create_aliases (self, arch, &local_error)) if (!pv_runtime_create_aliases (self, arch, &local_error))
{ {
/* This is not a critical error, try to continue */ /* This is not a critical error, try to continue */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment