Skip to content

Commit

Permalink
Revert "chore: ⬆️ Update some dependencies"
Browse files Browse the repository at this point in the history
This reverts commit c08e67e.
  • Loading branch information
zmerp committed Oct 9, 2024
1 parent 33ea339 commit 5f96421
Show file tree
Hide file tree
Showing 13 changed files with 813 additions and 850 deletions.
1,630 changes: 799 additions & 831 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions alvr/client_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pollster = "0.3"
rand = "0.8"
serde = "1"
serde_json = "1"
wgpu = "22"
wgpu-core = { version = "22", features = ["gles"] }
wgpu = "0.20"
wgpu-core = { version = "0.21", features = ["gles"] }
whoami = "1"

[target.'cfg(target_os = "android")'.dependencies]
Expand Down
1 change: 0 additions & 1 deletion alvr/client_core/src/graphics/lobby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ fn create_pipeline(
})],
}),
multiview: None,
cache: None,
})
}

Expand Down
3 changes: 1 addition & 2 deletions alvr/client_core/src/graphics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ pub struct GraphicsContext {
impl GraphicsContext {
#[cfg(not(windows))]
pub fn new_gl() -> Self {
use wgpu::{Backends, DeviceDescriptor, Features, Limits, MemoryHints};
use wgpu::{Backends, DeviceDescriptor, Features, Limits};

const CREATE_IMAGE_FN_STR: &str = "eglCreateImageKHR";
const DESTROY_IMAGE_FN_STR: &str = "eglDestroyImageKHR";
Expand Down Expand Up @@ -210,7 +210,6 @@ impl GraphicsContext {
max_push_constant_size: 72,
..adapter.limits()
},
memory_hints: MemoryHints::Performance,
},
None,
))
Expand Down
3 changes: 0 additions & 3 deletions alvr/client_core/src/graphics/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ impl StreamRenderer {
compilation_options: PipelineCompilationOptions {
constants,
zero_initialize_workgroup_memory: false,
vertex_pulling_transform: false,
},
buffers: &[],
},
Expand All @@ -144,7 +143,6 @@ impl StreamRenderer {
compilation_options: PipelineCompilationOptions {
constants,
zero_initialize_workgroup_memory: false,
vertex_pulling_transform: false,
},
targets: &[Some(ColorTargetState {
format: target_format,
Expand All @@ -153,7 +151,6 @@ impl StreamRenderer {
})],
}),
multiview: None,
cache: None,
});

let sampler = device.create_sampler(&SamplerDescriptor {
Expand Down
2 changes: 1 addition & 1 deletion alvr/client_mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ alvr_client_core.workspace = true
alvr_packets.workspace = true
alvr_session.workspace = true

eframe = "0.29"
eframe = "0.28"
env_logger = "0.11"
rand = "0.8"
2 changes: 1 addition & 1 deletion alvr/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ settings-schema = { git = "https://github.com/alvr-org/settings-schema-rs", rev
# settings-schema = { path = "../../../../settings-schema-rs/settings-schema" }

[target.'cfg(not(target_os = "android"))'.dependencies]
rfd = { version = "0.15", optional = true }
rfd = { version = "0.14", optional = true }
4 changes: 2 additions & 2 deletions alvr/dashboard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ alvr_gui_common.workspace = true

bincode = "1"
chrono = "0.4"
eframe = "0.29"
eframe = "0.28"
env_logger = "0.11"
ico = "0.3"
rand = "0.8"
Expand All @@ -32,7 +32,7 @@ tungstenite = "0.24"
ureq = { version = "2", features = ["json"] }

[target.'cfg(target_os = "linux")'.dependencies]
wgpu = "22"
wgpu = "0.20"
libva = { package = "cros-libva", version = "0.0.7" }
nvml-wrapper = "0.10.0"

Expand Down
2 changes: 1 addition & 1 deletion alvr/dashboard/src/dashboard/components/about.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn about_tab_ui(ui: &mut Ui) {
.inner_margin(egui::vec2(15.0, 12.0))
.show(ui, |ui| {
ScrollArea::new([false, true])
.id_salt("license_scroll")
.id_source("license_scroll")
.show(ui, |ui| ui.label(include_str!("../../../../../LICENSE")))
});
}
4 changes: 2 additions & 2 deletions alvr/dashboard/src/dashboard/components/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ impl SettingsTab {

if self.selected_top_tab_id == "presets" {
ScrollArea::new([false, true])
.id_salt("presets_scroll")
.id_source("presets_scroll")
.show(ui, |ui| {
Grid::new("presets_grid")
.striped(true)
Expand Down Expand Up @@ -194,7 +194,7 @@ impl SettingsTab {
});
} else {
ScrollArea::new([false, true])
.id_salt(format!("{}_scroll", self.selected_top_tab_id))
.id_source(format!("{}_scroll", self.selected_top_tab_id))
.show(ui, |ui| {
Grid::new(format!("{}_grid", self.selected_top_tab_id))
.striped(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl Control {
request = get_request(&self.nesting_info, variant_mut);
}
} else if let Some(mut index) = self.variant_indices.get(variant_mut).cloned() {
let response = ComboBox::from_id_salt(self.combobox_id).show_index(
let response = ComboBox::from_id_source(self.combobox_id).show_index(
ui,
&mut index,
self.variant_labels.len(),
Expand All @@ -142,7 +142,7 @@ impl Control {
}
} else {
let mut index = 0;
let response = ComboBox::from_id_salt(self.combobox_id).show_index(
let response = ComboBox::from_id_source(self.combobox_id).show_index(
ui,
&mut index,
self.variant_labels.len() + 1,
Expand Down
2 changes: 1 addition & 1 deletion alvr/gui_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ license.workspace = true
[dependencies]
alvr_common.workspace = true

egui = "0.29"
egui = "0.28"
2 changes: 1 addition & 1 deletion alvr/launcher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ alvr_common.workspace = true
alvr_gui_common.workspace = true

anyhow = "1"
eframe = "0.29"
eframe = "0.28"
flate2 = "1.0.18"
futures-util = "0.3.28"
ico = "0.3"
Expand Down

0 comments on commit 5f96421

Please sign in to comment.