From 92f49633d7d0b3cf8114e5a120d9188475d818d5 Mon Sep 17 00:00:00 2001 From: suppergerrie2 <15769860+suppergerrie2@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:39:16 +0200 Subject: [PATCH 1/2] Update d3d12 to 0.20.0 to fix compilation error on windows --- Cargo.lock | 2 +- crates/bevy_openxr/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad819be..e933824 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,7 +758,7 @@ dependencies = [ "bevy", "bevy_mod_xr", "bevy_xr_utils", - "d3d12 0.19.0", + "d3d12 0.20.0", "jni 0.20.0", "ndk-context", "openxr", diff --git a/crates/bevy_openxr/Cargo.toml b/crates/bevy_openxr/Cargo.toml index 389478c..83b9eb0 100644 --- a/crates/bevy_openxr/Cargo.toml +++ b/crates/bevy_openxr/Cargo.toml @@ -42,4 +42,4 @@ wgpu = { version = "0.19.3", features = ["vulkan-portability"] } [target.'cfg(target_family = "windows")'.dependencies] openxr = { version = "0.18.0", features = ["mint", "static"] } winapi = { version = "0.3.9", optional = true } -d3d12 = { version = "0.19", features = ["libloading"], optional = true } +d3d12 = { version = "0.20", features = ["libloading"], optional = true } From 9b28f34570d8927f1a2531afad34a209b30d710d Mon Sep 17 00:00:00 2001 From: suppergerrie2 <15769860+suppergerrie2@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:39:54 +0200 Subject: [PATCH 2/2] Enable default bevy features in android crate to allow PBR components to be used --- crates/bevy_openxr/examples/android/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_openxr/examples/android/Cargo.toml b/crates/bevy_openxr/examples/android/Cargo.toml index 8e03c66..6ec7adc 100644 --- a/crates/bevy_openxr/examples/android/Cargo.toml +++ b/crates/bevy_openxr/examples/android/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] bevy_mod_openxr.path = "../.." -bevy.workspace = true +bevy = { workspace = true, default-features = true } bevy_xr_utils.path = "../../../bevy_xr_utils"