Merge branch 'raytracing-support' into 'master'

Raytracing support See merge request nvidia/container-toolkit/libnvidia-container!11
NVIDIA · Nov 11, 2019 · 0fd1450 · 0fd1450
2 parents 2b2b0e1 + 48d33cc
commit 0fd1450
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 22 deletions.
diff --git a/pkg/deb/changelog b/pkg/deb/changelog
@@ -1,3 +1,9 @@
+libnvidia-container (1.0.7-1) UNRELEASED; urgency=medium
+
+  * 8d90918a Add Raytracing library
+
+ -- NVIDIA CORPORATION <[email protected]>  Mon, 11 Nov 2019 13:23:58 -0700
+
 libnvidia-container (1.0.6-1) UNRELEASED; urgency=medium
 
   * b6aff41 Update error messages for CUDA version requirements

diff --git a/pkg/deb/libnvidia-container@[email protected] b/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.6
- nvc_config_free@NVC_1.0 1.0.6
- nvc_config_new@NVC_1.0 1.0.6
- nvc_container_config_free@NVC_1.0 1.0.6
- nvc_container_config_new@NVC_1.0 1.0.6
- nvc_container_free@NVC_1.0 1.0.6
- nvc_container_new@NVC_1.0 1.0.6
- nvc_context_free@NVC_1.0 1.0.6
- nvc_context_new@NVC_1.0 1.0.6
- nvc_device_info_free@NVC_1.0 1.0.6
- nvc_device_info_new@NVC_1.0 1.0.6
- nvc_device_mount@NVC_1.0 1.0.6
- nvc_driver_info_free@NVC_1.0 1.0.6
- nvc_driver_info_new@NVC_1.0 1.0.6
- nvc_driver_mount@NVC_1.0 1.0.6
- nvc_error@NVC_1.0 1.0.6
- nvc_init@NVC_1.0 1.0.6
- nvc_ldcache_update@NVC_1.0 1.0.6
- nvc_shutdown@NVC_1.0 1.0.6
- nvc_version@NVC_1.0 1.0.6
+ NVC_1.0@NVC_1.0 1.0.7
+ nvc_config_free@NVC_1.0 1.0.7
+ nvc_config_new@NVC_1.0 1.0.7
+ nvc_container_config_free@NVC_1.0 1.0.7
+ nvc_container_config_new@NVC_1.0 1.0.7
+ nvc_container_free@NVC_1.0 1.0.7
+ nvc_container_new@NVC_1.0 1.0.7
+ nvc_context_free@NVC_1.0 1.0.7
+ nvc_context_new@NVC_1.0 1.0.7
+ nvc_device_info_free@NVC_1.0 1.0.7
+ nvc_device_info_new@NVC_1.0 1.0.7
+ nvc_device_mount@NVC_1.0 1.0.7
+ nvc_driver_info_free@NVC_1.0 1.0.7
+ nvc_driver_info_new@NVC_1.0 1.0.7
+ nvc_driver_mount@NVC_1.0 1.0.7
+ nvc_error@NVC_1.0 1.0.7
+ nvc_init@NVC_1.0 1.0.7
+ nvc_ldcache_update@NVC_1.0 1.0.7
+ nvc_shutdown@NVC_1.0 1.0.7
+ nvc_version@NVC_1.0 1.0.7
diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec
@@ -85,6 +85,9 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Mon Nov 11 2019 NVIDIA CORPORATION <[email protected]> 1.0.7-1
+ - 8d90918a Add Raytracing library
+
 * Fri Sep 013 2019 NVIDIA CORPORATION <[email protected]> 1.0.6-1
  - b6aff41 Update error messages for CUDA version requirements
 

diff --git a/src/nvc.h b/src/nvc.h
@@ -15,8 +15,8 @@ extern "C" {
 
 #define NVC_MAJOR   1
 #define NVC_MINOR   0
-#define NVC_PATCH   6
-#define NVC_VERSION "1.0.6"
+#define NVC_PATCH   7
+#define NVC_VERSION "1.0.7"
 
 #define NVC_ARG_MAX 256
 

diff --git a/src/nvc_info.c b/src/nvc_info.c
@@ -105,6 +105,7 @@ static const char * const graphics_libs_glvnd[] = {
         "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 */
+	"libnvidia-cbl.so",                 /* VK_NV_ray_tracing */
 };
 
 static const char * const graphics_libs_compat[] = {