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

update Things...

Browse source
This commit is contained in:
Alex Janka 2024-05-26 11:06:46 +10:00
parent 24af9dd689
commit 101a0fc062
6 changed files with 1069 additions and 885 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1939
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

7
Cargo.toml
View file

@ -21,11 +21,8 @@ librashader-reflect = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-runtime = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-runtime-vk = { git = "https://git.alexjanka.com/alex/librashader" }
librashader-cache = { git = "https://git.alexjanka.com/alex/librashader" }
ash = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }
ash-window = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }
ash = "0.38.0"
ash-window = "0.13.0"
[patch."https://github.com/RustAudio/baseview.git"]
baseview = { git = "https://git.alexjanka.com/alex/baseview" }
[patch.crates-io]
ash = { git = "https://git.alexjanka.com/alex/ash", branch = "raw-window-handle-0.6.0" }

2
cli/src/main.rs
View file

@ -1,7 +1,5 @@
#![feature(let_chains, if_let_guard, iter_array_chunks)]
#[cfg(feature = "camera")]
use camera::Webcam;
use clap::{ArgGroup, Parser, Subcommand, ValueEnum};
use frontend_common::{audio, debug::Debugger, window::ActiveWindowManager};
use gb_emu_lib::{

2
lib/Cargo.toml
View file

@ -51,7 +51,7 @@ librashader-common = { workspace = true, optional = true }
directories = { version = "5.0", optional = true }
ron = { version = "0.8", optional = true }
lazy_static = "1.4"
wgpu = { version = "0.19", optional = true }
wgpu = { version = "0.20", optional = true }
thiserror = { workspace = true }
log = { workspace = true }

2
lib/src/lib.rs
View file

@ -1,4 +1,4 @@
#![feature(exclusive_range_pattern, let_chains, bigint_helper_methods)]
#![feature(let_chains, bigint_helper_methods)]
use crate::processor::{memory::Memory, Flags};
use connect::{AudioOutput, EmulatorCoreTrait, EmulatorMessage, EmulatorOptions, RomFile};

2
lib/src/processor/memory/addresses.rs
View file

@ -132,7 +132,7 @@ impl TryInto<IoAddress> for u16 {
fn try_into(self) -> Result<IoAddress, Self::Error> {
match self {
0xFF00 => Ok(IoAddress::Joypad),
0xFF01..0xFF03 => Ok(IoAddress::Serial(self.try_into().unwrap())),
0xFF01..=0xFF02 => Ok(IoAddress::Serial(self.try_into().unwrap())),
0xFF04..0xFF08 => Ok(IoAddress::Timer(self.try_into().unwrap())),
0xFF0F => Ok(IoAddress::InterruptFlag),
0xFF10..0xFF27 => Ok(IoAddress::Audio(self.try_into().unwrap())),