alex/gb-emu
1
0
Fork 0
Code Pull requests Actions Packages Releases Activity

update deps

Browse source
This commit is contained in:
Alex Janka 2024-10-23 14:02:56 +11:00
parent b5ea1d9e99
commit 49464a58a5
12 changed files with 510 additions and 827 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1234
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -6,7 +6,7 @@ resolver = "2"
[workspace.dependencies]
log = "0.4.22"
env_logger = "0.11.5"
thiserror = "1.0.63"
thiserror = "1.0.65"
raw-window-handle = "0.6.2"
gb-emu-lib = { path = "./lib", features = ["config"] }
frontend-common = { path = "./frontend-common" }

6
cli/Cargo.toml
View file

@ -16,8 +16,8 @@ vulkan = ["frontend-common/vulkan"]
[dependencies]
frontend-common = { workspace = true }
gb-emu-lib = { workspace = true }
clap = { version = "4.5.15", features = ["derive"] }
ctrlc = "3.4.4"
clap = { version = "4.5.20", features = ["derive"] }
ctrlc = "3.4.5"
log = { workspace = true }
env_logger = { workspace = true }
anyhow = { version = "1.0.86", features = ["backtrace"] }
anyhow = { version = "1.0.91", features = ["backtrace"] }

12
frontend-common/Cargo.toml
View file

@ -13,16 +13,16 @@ wgpu = ["gb-emu-lib/wgpu-renderer"]
[dependencies]
gb-emu-lib = { workspace = true }
gilrs = "0.10.9"
gilrs = "0.11.0"
cpal = { version = "0.15.3", features = ["jack"] }
futures = "0.3.30"
futures = "0.3.31"
send_wrapper = { version = "0.6.0", optional = true }
winit = { version = "0.29.15", features = ["rwh_05"] }
winit_input_helper = "0.16.0"
raw-window-handle = { workspace = true }
serde = { version = "1.0.205", features = ["derive"] }
image = { version = "0.25.2", default-features = false, features = ["png"] }
bytemuck = "1.16.3"
serde = { version = "1.0.213", features = ["derive"] }
image = { version = "0.25.4", default-features = false, features = ["png"] }
bytemuck = "1.19.0"
chrono = "0.4.38"
log = { workspace = true }
anyhow = "1.0.86"
anyhow = "1.0.91"

8
gb-vst/Cargo.toml
View file

@ -27,8 +27,8 @@ nih_plug = { workspace = true, features = [
"vst3",
], optional = true }
baseview = { workspace = true, optional = true }
async-ringbuf = { version = "0.2.1", optional = true }
futures = { version = "0.3.30", optional = true }
keyboard-types = { version = "0.6.2", optional = true }
async-ringbuf = { version = "0.3.1", optional = true }
futures = { version = "0.3.31", optional = true }
keyboard-types = { version = "0.7.0", optional = true }
raw-window-handle = { workspace = true }
serde = { version = "1.0.205", features = ["derive"] }
serde = { version = "1.0.213", features = ["derive"] }

1
gb-vst/src/plugin/ui.rs
View file

@ -69,7 +69,6 @@ impl Editor for TwincEditor {
title: String::from("gb-emu"),
size,
scale: baseview::WindowScalePolicy::SystemScaleFactor,
gl_config: Default::default(),
},
move |window| {
let manager = Arc::new(

10
gui/Cargo.toml
View file

@ -24,7 +24,7 @@ adw = { version = "0.7.0", package = "libadwaita", features = [
], optional = true }
frontend-common = { workspace = true }
gb-emu-lib = { workspace = true }
gtk = { version = "0.9.0", package = "gtk4", features = [
gtk = { version = "0.9.2", package = "gtk4", features = [
"v4_12",
], optional = true }
twinc_emu_vst = { path = "../gb-vst", default-features = false }
@ -33,13 +33,13 @@ cpal = "0.15.3"
log = { workspace = true }
env_logger = { workspace = true }
thiserror = { workspace = true }
serde = { version = "1.0.205", features = ["derive"] }
anyhow = "1.0.86"
serde = { version = "1.0.213", features = ["derive"] }
anyhow = "1.0.91"
[target.'cfg(any(target_os = "macos"))'.dependencies]
cacao = { git = "https://git.alexjanka.com/alex/cacao", optional = true }
objc = { version = "=0.3.0-beta.3", package = "objc2", optional = true }
uuid = { version = "1.10.0", features = ["v4", "fast-rng"], optional = true }
objc = { version = "0.5.2", package = "objc2", optional = true }
uuid = { version = "1.11.0", features = ["v4", "fast-rng"], optional = true }
[build-dependencies]
glib-build-tools = { version = "0.20.0", optional = true }

14
lib/Cargo.toml
View file

@ -34,12 +34,12 @@ error-colour = []
[dependencies]
rand = "0.8.5"
async-ringbuf = "0.2.1"
futures = "0.3.30"
async-ringbuf = "0.3.1"
futures = "0.3.31"
itertools = "0.13.0"
serde = { version = "1.0.205", features = ["derive"] }
serde_with = "3.9.0"
bytemuck = "1.16.3"
serde = { version = "1.0.213", features = ["derive"] }
serde_with = "3.11.0"
bytemuck = "1.19.0"
num-traits = "0.2.19"
pixels = { git = "https://git.alexjanka.com/alex/pixels", optional = true }
ash = { workspace = true, features = ["linked"], optional = true }
@ -54,7 +54,7 @@ lazy_static = "1.5.0"
wgpu = { version = "22.1.0", optional = true }
thiserror = { workspace = true }
log = { workspace = true }
anyhow = "1.0.86"
anyhow = "1.0.91"
[build-dependencies]
naga = { version = "22.1.0", optional = true, features = [
@ -63,4 +63,4 @@ naga = { version = "22.1.0", optional = true, features = [
] }
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
ash-molten = { version = "0.19.0", optional = true }
ash-molten = { version = "0.20.0", optional = true }

10
lib/src/renderer/shaders/mod.rs
View file

@ -2,12 +2,13 @@ use librashader_presets::ShaderPreset;
pub fn default_preset() -> ShaderPreset {
ShaderPreset {
shader_count: 1,
shaders: vec![librashader_presets::ShaderPassConfig {
id: 0,
name: librashader_common::ShaderStorage::String(
pass_count: 1,
passes: vec![librashader_presets::PassConfig {
storage: librashader_common::StorageType::String(
include_str!("./stock.slang").to_string(),
),
meta: librashader_presets::PassMeta {
id: 0,
alias: None,
filter: librashader::FilterMode::Nearest,
wrap_mode: librashader::WrapMode::ClampToBorder,
@ -26,6 +27,7 @@ pub fn default_preset() -> ShaderPreset {
factor: librashader_presets::ScaleFactor::Float(1.0),
},
},
},
}],
textures: vec![],
parameters: vec![],

1
lib/src/renderer/vulkan/mod.rs
View file

@ -472,6 +472,7 @@ impl VulkanWindowInner {
size: self.swapchain.surface_resolution.into(),
format: self.swapchain.format.format,
},
size: self.swapchain.surface_resolution.into(),
},
self.vulkan_data.draw_command_buffer,
self.frame_counter,

1
lib/src/renderer/wgpu.rs
View file

@ -252,6 +252,7 @@ impl RendererBackend for WgpuBackend {
filter_output.size().into(),
filter_output.format(),
),
size: filter_output.size().into(),
},
&mut encoder,
self.frame_num,

6
xtask/Cargo.toml
View file

@ -6,13 +6,13 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
clap = { version = "4.5.15", features = ["derive"] }
clap = { version = "4.5.20", features = ["derive"] }
strum = { version = "0.26.3", features = ["derive"] }
duct = "0.13.7"
cargo_metadata = "0.18.1"
cfg-expr = "0.16.0"
cfg-expr = "0.17.0"
pbr = "1.1.1"
serde_json = "1.0.125"
serde_json = "1.0.132"
nih_plug_xtask = { workspace = true }
log = { workspace = true }
env_logger = { workspace = true }