From 8e6d1cba1524cfe14b60cb76f4bfe502dbd196e6 Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Sat, 13 Jan 2024 12:59:04 -0800
Subject: [PATCH] Pull in shader and driver changes to support custom time or
 device-based banners

---
 bin/package_vulkan          | 5 ++---
 modules/xrealAirLinuxDriver | 2 +-
 vulkan/bin/setup            | 2 +-
 vulkan/modules/sombrero     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/package_vulkan b/bin/package_vulkan
index e978d84..5236546 100755
--- a/bin/package_vulkan
+++ b/bin/package_vulkan
@@ -41,9 +41,8 @@ cp $VKBASALT_BUILD_DIR/builddir/config/vkBasalt.json $PACKAGE_DIR/vkBasalt.64/
 cp $VKBASALT_BUILD_DIR/builddir.32/src/libvkbasalt.so $PACKAGE_DIR/vkBasalt.32/
 
 # copy Sombrero FX, get ReShade headers
-cp $VULKAN_MODULES/sombrero/IMUAdjust.fx $PACKAGE_DIR
-cp $VULKAN_MODULES/sombrero/Sideview.fx $PACKAGE_DIR
-cp $VULKAN_MODULES/sombrero/calibrating.png $PACKAGE_DIR
+cp $VULKAN_MODULES/sombrero/*.fx $PACKAGE_DIR
+cp $VULKAN_MODULES/sombrero/*.png $PACKAGE_DIR
 wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShade.fxh
 wget -P $PACKAGE_DIR https://raw.githubusercontent.com/crosire/reshade-shaders/384465d0287999caa6190b5ebea506200b4f4a0a/Shaders/ReShadeUI.fxh
 
diff --git a/modules/xrealAirLinuxDriver b/modules/xrealAirLinuxDriver
index 0df917d..ed55d0d 160000
--- a/modules/xrealAirLinuxDriver
+++ b/modules/xrealAirLinuxDriver
@@ -1 +1 @@
-Subproject commit 0df917d0fa0813512634aab06a343963d869a2a0
+Subproject commit ed55d0d93724fb3747b3e54c42d2d9e89a03bc17
diff --git a/vulkan/bin/setup b/vulkan/bin/setup
index 2264802..4f9ad41 100755
--- a/vulkan/bin/setup
+++ b/vulkan/bin/setup
@@ -57,7 +57,7 @@ chown -R $USER:$USER $USER_HOME/.config/vkBasalt
 
 echo "Installing the Sombrero shaders and texture files to ${USER_HOME}/.config/reshade/{Shaders,Textures}"
 cp *.fx* $USER_HOME/.config/reshade/Shaders
-cp calibrating.png $USER_HOME/.config/reshade/Textures
+cp *.png $USER_HOME/.config/reshade/Textures
 chown -R $USER:$USER $USER_HOME/.config/reshade
 
 # set up the XREAL driver using the local binary
diff --git a/vulkan/modules/sombrero b/vulkan/modules/sombrero
index 4795db2..b00ad70 160000
--- a/vulkan/modules/sombrero
+++ b/vulkan/modules/sombrero
@@ -1 +1 @@
-Subproject commit 4795db2e4469d1e2924a054dbaeefce54960172f
+Subproject commit b00ad70780be10d04a959a1541658b1a1d6a21bd