From eb5d50abc499c8e3d36c47083d93922de73935a5 Mon Sep 17 00:00:00 2001
From: Evan Lezar <7723350-elezar@users.noreply.gitlab.com>
Date: Wed, 22 Nov 2023 19:47:52 +0000
Subject: [PATCH] Merge branch 'include-nvoptix' into 'main'

Update list of graphics mounts

See merge request nvidia/container-toolkit/container-toolkit!501
---
 CHANGELOG.md                  | 4 ++++
 internal/discover/graphics.go | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5aa69dc9..bde84c17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # NVIDIA Container Toolkit Changelog
 
+## v1.14.4
+* Include `nvidia/nvoptix.bin` in list of graphics mounts.
+* Include `vulkan/icd.d/nvidia_layers.json` in list of graphics mounts.
+
 ## v1.14.3
 * [toolkit-container] Bump CUDA base image version to 12.2.2.
 
diff --git a/internal/discover/graphics.go b/internal/discover/graphics.go
index 0bc9451e..b4f99c5a 100644
--- a/internal/discover/graphics.go
+++ b/internal/discover/graphics.go
@@ -78,9 +78,11 @@ func NewGraphicsMountsDiscoverer(logger logger.Interface, driverRoot string, nvi
 		[]string{
 			"glvnd/egl_vendor.d/10_nvidia.json",
 			"vulkan/icd.d/nvidia_icd.json",
+			"vulkan/icd.d/nvidia_layers.json",
 			"vulkan/implicit_layer.d/nvidia_layers.json",
 			"egl/egl_external_platform.d/15_nvidia_gbm.json",
 			"egl/egl_external_platform.d/10_nvidia_wayland.json",
+			"nvidia/nvoptix.bin",
 		},
 	)