Merge branch 'vulkan-support' into 'master'

Vulkan support

See merge request nvidia/container-toolkit/libnvidia-container!1

Author: RenaudWasTaken

pkg/deb/changelog

@@ -1,4 +1,8 @@
-libnvidia-container (1.0.2-1) UNRELEASED; urgency=medium
+libnvidia-container (1.0.3-1) UNRELEASED; urgency=medium
+
+  * b9545d7 Add support for Vulkan
+
+ -- NVIDIA CORPORATION <[email protected]>  Thu, Jul 18 2019 13:34:30 -0700
 
   * 4045013 Adds support for libnvidia-opticalflow
 

pkg/deb/libnvidia-container@[email protected]

@@ -1,21 +1,21 @@
 libnvidia-container.so.1 libnvidia-container1 #MINVER#
- NVC_1.0@NVC_1.0 1.0.2
- nvc_config_free@NVC_1.0 1.0.2
- nvc_config_new@NVC_1.0 1.0.2
- nvc_container_config_free@NVC_1.0 1.0.2
- nvc_container_config_new@NVC_1.0 1.0.2
- nvc_container_free@NVC_1.0 1.0.2
- nvc_container_new@NVC_1.0 1.0.2
- nvc_context_free@NVC_1.0 1.0.2
- nvc_context_new@NVC_1.0 1.0.2
- nvc_device_info_free@NVC_1.0 1.0.2
- nvc_device_info_new@NVC_1.0 1.0.2
- nvc_device_mount@NVC_1.0 1.0.2
- nvc_driver_info_free@NVC_1.0 1.0.2
- nvc_driver_info_new@NVC_1.0 1.0.2
- nvc_driver_mount@NVC_1.0 1.0.2
- nvc_error@NVC_1.0 1.0.2
- nvc_init@NVC_1.0 1.0.2
- nvc_ldcache_update@NVC_1.0 1.0.2
- nvc_shutdown@NVC_1.0 1.0.2
- nvc_version@NVC_1.0 1.0.2
+ NVC_1.0@NVC_1.0 1.0.3
+ nvc_config_free@NVC_1.0 1.0.3
+ nvc_config_new@NVC_1.0 1.0.3
+ nvc_container_config_free@NVC_1.0 1.0.3
+ nvc_container_config_new@NVC_1.0 1.0.3
+ nvc_container_free@NVC_1.0 1.0.3
+ nvc_container_new@NVC_1.0 1.0.3
+ nvc_context_free@NVC_1.0 1.0.3
+ nvc_context_new@NVC_1.0 1.0.3
+ nvc_device_info_free@NVC_1.0 1.0.3
+ nvc_device_info_new@NVC_1.0 1.0.3
+ nvc_device_mount@NVC_1.0 1.0.3
+ nvc_driver_info_free@NVC_1.0 1.0.3
+ nvc_driver_info_new@NVC_1.0 1.0.3
+ nvc_driver_mount@NVC_1.0 1.0.3
+ nvc_error@NVC_1.0 1.0.3
+ nvc_init@NVC_1.0 1.0.3
+ nvc_ldcache_update@NVC_1.0 1.0.3
+ nvc_shutdown@NVC_1.0 1.0.3
+ nvc_version@NVC_1.0 1.0.3

pkg/rpm/SPECS/libnvidia-container.spec

@@ -85,6 +85,9 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Thu Jul 18 2019 NVIDIA CORPORATION <[email protected]> 1.0.3-1
+- b9545d7 Add support for Vulkan
+
 * Tue Feb 05 2019 NVIDIA CORPORATION <[email protected]> 1.0.2-1
 - 4045013 Adds support for libnvidia-opticalflow
 

src/nvc.h

@@ -15,8 +15,8 @@ extern "C" {
 
 #define NVC_MAJOR   1
 #define NVC_MINOR   0
-#define NVC_PATCH   2
-#define NVC_VERSION "1.0.2"
+#define NVC_PATCH   3
+#define NVC_VERSION "1.0.3"
 
 #define NVC_ARG_MAX 256
 

src/nvc_info.c

@@ -102,6 +102,7 @@ static const char * const graphics_libs_glvnd[] = {
         "libEGL_nvidia.so",                 /* EGL ICD */
         "libGLESv2_nvidia.so",              /* OpenGL ES v2 ICD */
         "libGLESv1_CM_nvidia.so",           /* OpenGL ES v1 common profile ICD */
+	"libnvidia-glvkspirv.so",           /* SPIR-V Lib for Vulkan */
 };
 
 static const char * const graphics_libs_compat[] = {

src/nvc_mount.c

@@ -404,6 +404,10 @@ symlink_libraries(struct error *err, const struct nvc_container *cnt, const char
                         /* XXX GLVND requires this symlink for indirect GLX support. */
                         if (symlink_library(err, paths[i], lib, "libGLX_indirect.so.0", cnt->uid, cnt->gid) < 0)
                                 return (-1);
+                } else if (str_has_prefix(lib, "libnvidia-opticalflow.so")) {
+                        /* XXX Fix missing symlink for libnvidia-opticalflow.so. */
+                        if (symlink_library(err, paths[i], "libnvidia-opticalflow.so.1", "libnvidia-opticalflow.so", cnt->uid, cnt->gid) < 0)
+                                return (-1);
                 }
         }
         return (0);