Compare commits
18 Commits
f7cf960b62
...
0debae0678
Author | SHA1 | Date |
---|---|---|
|
0debae0678 | |
|
c715d4ddc8 | |
|
f64cab8f5c | |
|
67c332c446 | |
|
1f74593410 | |
|
73fde4dc58 | |
|
c62698c0e9 | |
|
706a1bb697 | |
|
bd983880b5 | |
|
e2821898ec | |
|
e052d592cf | |
|
bad93bb82e | |
|
d674cd2e00 | |
|
857ee04e51 | |
|
655557b84a | |
|
1af312cc4f | |
|
a6f379fb3f | |
|
6bded6d330 |
|
@ -1763,7 +1763,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lemur"
|
name = "lemur"
|
||||||
version = "0.3.2"
|
version = "0.3.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"atoi",
|
"atoi",
|
||||||
|
|
|
@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy."
|
||||||
repository = "https://git.virtual-boy.com/PVB/lemur"
|
repository = "https://git.virtual-boy.com/PVB/lemur"
|
||||||
publish = false
|
publish = false
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
version = "0.3.2"
|
version = "0.3.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
76
src/app.rs
76
src/app.rs
|
@ -40,7 +40,6 @@ fn load_icon() -> anyhow::Result<IconData> {
|
||||||
|
|
||||||
pub struct Application {
|
pub struct Application {
|
||||||
icon: Option<Arc<IconData>>,
|
icon: Option<Arc<IconData>>,
|
||||||
wgpu: WgpuState,
|
|
||||||
client: EmulatorClient,
|
client: EmulatorClient,
|
||||||
proxy: EventLoopProxy<UserEvent>,
|
proxy: EventLoopProxy<UserEvent>,
|
||||||
mappings: MappingProvider,
|
mappings: MappingProvider,
|
||||||
|
@ -59,7 +58,6 @@ impl Application {
|
||||||
proxy: EventLoopProxy<UserEvent>,
|
proxy: EventLoopProxy<UserEvent>,
|
||||||
debug_port: Option<u16>,
|
debug_port: Option<u16>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let wgpu = WgpuState::new();
|
|
||||||
let icon = load_icon().ok().map(Arc::new);
|
let icon = load_icon().ok().map(Arc::new);
|
||||||
let persistence = Persistence::new();
|
let persistence = Persistence::new();
|
||||||
let mappings = MappingProvider::new(persistence.clone());
|
let mappings = MappingProvider::new(persistence.clone());
|
||||||
|
@ -73,7 +71,6 @@ impl Application {
|
||||||
}
|
}
|
||||||
Self {
|
Self {
|
||||||
icon,
|
icon,
|
||||||
wgpu,
|
|
||||||
client,
|
client,
|
||||||
proxy,
|
proxy,
|
||||||
mappings,
|
mappings,
|
||||||
|
@ -94,7 +91,7 @@ impl Application {
|
||||||
}
|
}
|
||||||
self.viewports.insert(
|
self.viewports.insert(
|
||||||
viewport_id,
|
viewport_id,
|
||||||
Viewport::new(event_loop, &self.wgpu, self.icon.clone(), window),
|
Viewport::new(event_loop, self.icon.clone(), window),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -269,58 +266,6 @@ impl ApplicationHandler<UserEvent> for Application {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct WgpuState {
|
|
||||||
instance: Arc<wgpu::Instance>,
|
|
||||||
adapter: Arc<wgpu::Adapter>,
|
|
||||||
device: Arc<wgpu::Device>,
|
|
||||||
queue: Arc<wgpu::Queue>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl WgpuState {
|
|
||||||
fn new() -> Self {
|
|
||||||
#[allow(unused_variables)]
|
|
||||||
let egui_wgpu::WgpuConfiguration {
|
|
||||||
wgpu_setup:
|
|
||||||
egui_wgpu::WgpuSetup::CreateNew {
|
|
||||||
supported_backends,
|
|
||||||
device_descriptor,
|
|
||||||
..
|
|
||||||
},
|
|
||||||
..
|
|
||||||
} = egui_wgpu::WgpuConfiguration::default()
|
|
||||||
else {
|
|
||||||
panic!("required fields not found")
|
|
||||||
};
|
|
||||||
#[cfg(windows)]
|
|
||||||
let supported_backends = wgpu::util::backend_bits_from_env()
|
|
||||||
.unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
|
|
||||||
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
|
|
||||||
backends: supported_backends,
|
|
||||||
..wgpu::InstanceDescriptor::default()
|
|
||||||
});
|
|
||||||
|
|
||||||
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
|
|
||||||
power_preference: wgpu::PowerPreference::HighPerformance,
|
|
||||||
compatible_surface: None,
|
|
||||||
force_fallback_adapter: false,
|
|
||||||
}))
|
|
||||||
.expect("could not create adapter");
|
|
||||||
|
|
||||||
let trace_path = std::env::var("WGPU_TRACE");
|
|
||||||
let (device, queue) = pollster::block_on(adapter.request_device(
|
|
||||||
&(*device_descriptor)(&adapter),
|
|
||||||
trace_path.ok().as_ref().map(std::path::Path::new),
|
|
||||||
))
|
|
||||||
.expect("could not request device");
|
|
||||||
Self {
|
|
||||||
instance: Arc::new(instance),
|
|
||||||
adapter: Arc::new(adapter),
|
|
||||||
device: Arc::new(device),
|
|
||||||
queue: Arc::new(queue),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Viewport {
|
struct Viewport {
|
||||||
painter: egui_wgpu::winit::Painter,
|
painter: egui_wgpu::winit::Painter,
|
||||||
ctx: Context,
|
ctx: Context,
|
||||||
|
@ -334,7 +279,6 @@ struct Viewport {
|
||||||
impl Viewport {
|
impl Viewport {
|
||||||
pub fn new(
|
pub fn new(
|
||||||
event_loop: &ActiveEventLoop,
|
event_loop: &ActiveEventLoop,
|
||||||
wgpu: &WgpuState,
|
|
||||||
icon: Option<Arc<IconData>>,
|
icon: Option<Arc<IconData>>,
|
||||||
mut app: Box<dyn AppWindow>,
|
mut app: Box<dyn AppWindow>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
|
@ -358,16 +302,20 @@ impl Viewport {
|
||||||
});
|
});
|
||||||
egui_extras::install_image_loaders(&ctx);
|
egui_extras::install_image_loaders(&ctx);
|
||||||
|
|
||||||
let wgpu_config = egui_wgpu::WgpuConfiguration {
|
#[allow(unused_mut)]
|
||||||
|
let mut wgpu_config = egui_wgpu::WgpuConfiguration {
|
||||||
present_mode: wgpu::PresentMode::AutoNoVsync,
|
present_mode: wgpu::PresentMode::AutoNoVsync,
|
||||||
wgpu_setup: egui_wgpu::WgpuSetup::Existing {
|
|
||||||
instance: wgpu.instance.clone(),
|
|
||||||
adapter: wgpu.adapter.clone(),
|
|
||||||
device: wgpu.device.clone(),
|
|
||||||
queue: wgpu.queue.clone(),
|
|
||||||
},
|
|
||||||
..egui_wgpu::WgpuConfiguration::default()
|
..egui_wgpu::WgpuConfiguration::default()
|
||||||
};
|
};
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
if let egui_wgpu::WgpuSetup::CreateNew {
|
||||||
|
supported_backends, ..
|
||||||
|
} = &mut wgpu_config.wgpu_setup
|
||||||
|
{
|
||||||
|
*supported_backends -= wgpu::Backends::VULKAN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let mut painter =
|
let mut painter =
|
||||||
egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
|
egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
|
||||||
|
|
Loading…
Reference in New Issue