ffd shader fixes/optimizations

* ffd shader fixes/optimizations * android build file updates
korejan · May 11, 2024 · 3297af9 · 3297af9
1 parent 92797d8
commit 3297af9
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/openxr-client/alxr-android-client/Cargo.toml b/alvr/openxr-client/alxr-android-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-android-client"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for android platorms"

diff --git a/alvr/openxr-client/alxr-android-client/lynx/Cargo.toml b/alvr/openxr-client/alxr-android-client/lynx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-lynx"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for android platorms"

diff --git a/alvr/openxr-client/alxr-android-client/pico-v4/Cargo.toml b/alvr/openxr-client/alxr-android-client/pico-v4/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-pico-v4"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Pico 4/Neo 3, pre PUI v5.2.x"

diff --git a/alvr/openxr-client/alxr-android-client/pico/Cargo.toml b/alvr/openxr-client/alxr-android-client/pico/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-pico"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Pico 4/Neo 3, PUI >= v5.2.x"

diff --git a/alvr/openxr-client/alxr-android-client/quest/Cargo.toml b/alvr/openxr-client/alxr-android-client/quest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-quest"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Oculus Quest 1/2"

diff --git a/alvr/openxr-client/alxr-client/Cargo.toml b/alvr/openxr-client/alxr-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for non-android platorms"

diff --git a/alvr/openxr-client/alxr-client/uwp/Cargo.toml b/alvr/openxr-client/alxr-client/uwp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-uwp"
-version = "1.33.1"
+version = "1.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 build = ".build/main.rs"

diff --git a/alvr/openxr-client/alxr-common/Cargo.toml b/alvr/openxr-client/alxr-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-common"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 

diff --git a/alvr/openxr-client/alxr-engine-sys/Cargo.toml b/alvr/openxr-client/alxr-engine-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-engine-sys"
-version = "0.33.1"
+version = "0.34.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 links = "alxr_engine"

diff --git a/alvr/openxr-client/alxr-engine-sys/android/.idea/deploymentTargetSelector.xml b/alvr/openxr-client/alxr-engine-sys/android/.idea/deploymentTargetSelector.xml
diff --git a/alvr/openxr-client/alxr-engine-sys/android/.idea/vcs.xml b/alvr/openxr-client/alxr-engine-sys/android/.idea/vcs.xml
diff --git a/alvr/openxr-client/alxr-engine-sys/android/app/build.gradle b/alvr/openxr-client/alxr-engine-sys/android/app/build.gradle
@@ -88,7 +88,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
 }
diff --git a/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine b/alvr/openxr-client/alxr-engine-sys/cpp/ALVR-OpenXR-Engine
+23 −60		src/alxr_engine/d3d_shaders/common/decodeFoveation.hlsl
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/videoStream_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/yuv3PlaneFmt/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/yuv3PlaneFmt/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/fovDecode/yuv3PlaneFmt/videoStream_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/videoStream_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/yuv3PlaneFmt/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/yuv3PlaneFmt/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/SM5/multivew/fovDecode/yuv3PlaneFmt/videoStream_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/videoStream_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/yuv3PlaneFmt/passthroughBlend_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/yuv3PlaneFmt/passthroughMask_frag.cso
+ −		src/alxr_engine/d3d_shaders/precompiled/multiview/fovDecode/yuv3PlaneFmt/videoStream_frag.cso
+86 −2		src/alxr_engine/foveation.h
+26 −14		src/alxr_engine/graphicsplugin_vulkan.cpp
+1 −1		src/alxr_engine/vulkan_shaders/common/baseVideoFrag.glsl
+26 −72		src/alxr_engine/vulkan_shaders/common/decodeFoveation.glsl
+1 −1		src/alxr_engine/vulkan_shaders/passthroughBlend_frag.glsl
+4 −4		src/alxr_engine/vulkan_shaders/passthroughMask_frag.glsl
+192 −244		src/alxr_engine/vulkan_shaders/precompiled/fovDecode/passthroughBlend_frag.spv
+200 −252		src/alxr_engine/vulkan_shaders/precompiled/fovDecode/passthroughMask_frag.spv
+184 −236		src/alxr_engine/vulkan_shaders/precompiled/fovDecode/videoStream_frag.spv
+189 −242		src/alxr_engine/vulkan_shaders/precompiled/multiview/fovDecode/passthroughBlend_frag.spv
+197 −250		src/alxr_engine/vulkan_shaders/precompiled/multiview/fovDecode/passthroughMask_frag.spv
+181 −234		src/alxr_engine/vulkan_shaders/precompiled/multiview/fovDecode/videoStream_frag.spv
+9 −9		src/alxr_engine/vulkan_shaders/precompiled/multiview/passthroughBlend_frag.spv
+12 −12		src/alxr_engine/vulkan_shaders/precompiled/multiview/passthroughMask_frag.spv
+9 −9		src/alxr_engine/vulkan_shaders/precompiled/multiview/videoStream_frag.spv
+9 −9		src/alxr_engine/vulkan_shaders/precompiled/passthroughBlend_frag.spv
+12 −12		src/alxr_engine/vulkan_shaders/precompiled/passthroughMask_frag.spv
+9 −9		src/alxr_engine/vulkan_shaders/precompiled/videoStream_frag.spv