Pull in sideview driver and sombrero updates

This commit is contained in:
wheaney 2023-12-21 22:26:20 -08:00
parent dc97425285
commit fd53eb4931
6 changed files with 13 additions and 6 deletions

2
.gitmodules vendored
View File

@ -5,6 +5,8 @@
[submodule "vulkan/modules/sombrero"]
path = vulkan/modules/sombrero
url = git@github.com:wheaney/sombrero.git
branch = plugins
[submodule "modules/xrealAirLinuxDriver"]
path = modules/xrealAirLinuxDriver
url = git@github.com:wheaney/xrealAirLinuxDriver.git
branch = plugins

View File

@ -42,6 +42,7 @@ 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
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

@ -1 +1 @@
Subproject commit 3371ce49ae0cd766eb978ab29b658e1f5e8aa68e
Subproject commit e3b49beeade9ea80bf6eed9658658984d5cab2cf

View File

@ -48,10 +48,13 @@ fi
chown $USER:$USER $USER_HOME/.local/share/vulkan/implicit_layer.d/vkBasalt.*
# copy the vkBasalt.conf file and make replacements
sed -e "s|/path/to/reshade-shaders|${USER_HOME}/.config/reshade|" -e "s|/path/to/sombrero|${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx|" config/vkBasalt.conf > $USER_HOME/.config/vkBasalt/vkBasalt.conf
sed -e "s|/path/to/reshade-shaders|${USER_HOME}/.config/reshade|" \
-e "s|/path/to/virtual_display|${USER_HOME}/.config/reshade/Shaders/IMUAdjust.fx|" \
-e "s|/path/to/sideview|${USER_HOME}/.config/reshade/Shaders/Sideview.fx|" \
config/vkBasalt.conf > $USER_HOME/.config/vkBasalt/vkBasalt.conf
chown -R $USER:$USER $USER_HOME/.config/vkBasalt
echo "Installing the Sombrero shader and texture files to ${USER_HOME}/.config/reshade/{Shaders,Textures}"
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
chown -R $USER:$USER $USER_HOME/.config/reshade

View File

@ -1,6 +1,7 @@
effects = sombrero
effects = virtual_display:sideview
sombrero = /path/to/sombrero
virtual_display = /path/to/virtual_display
sideview = /path/to/sideview
reshadeTexturePath = "/path/to/reshade-shaders/Textures"
reshadeIncludePath = "/path/to/reshade-shaders/Shaders"
depthCapture = off

@ -1 +1 @@
Subproject commit 5e26880d3221dd8a30aae4ef6b34f52a157e2adf
Subproject commit c429d5614e71238d6377b4929208fbebc35b0f52