Merge 937ccf60c9 into 0878aa3f02

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
     - name: Build
       run: cargo build --release --verbose
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: uw8-${{ matrix.build }}
         path: target/release/${{ matrix.exe }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uw8"
-version = "0.4.1"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -11,7 +11,7 @@ native = ["wasmtime", "uw8-window", "cpal", "rubato" ]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
 
 [dependencies]
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", rev = "0f48f939b9870036562ca02ff21253547a9f1a5c", optional = true }
+wasmtime = { version = "19.0.1", optional = true }
 anyhow = "1"
 env_logger = "0.11.3"
 log = "0.4"
@@ -28,4 +28,4 @@ tokio-stream = { version = "0.1.15", features = ["sync"], optional = true }
 webbrowser = { version = "0.8.13", optional = true }
 ansi_term = "0.12.1"
 cpal = { version = "0.15.3", optional = true }
-rubato = { version = "0.12.0", optional = true }
+rubato = { version = "0.15.0", optional = true }

README.md

@@ -15,9 +15,9 @@ See [here](https://exoticorn.github.io/microw8/) for more information and docs.
 
 ## Downloads
 
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
 
 The download includes
 

examples/curlywas/tunnel.cwa

@@ -3,14 +3,12 @@ include "../include/microw8-api.cwa"
 export fn upd() {
     let i: i32;
     loop pixels {
-        let inline t = 16!56;
+        let inline t = time() * 63 as f32;
-        let inline x = (i % 320 - 160) as f32;
+        let lazy x = (i % 320 - 160) as f32;
-        let inline y = (i #/ 320 - 120) as f32;
+        let lazy y = (i / 320 - 120) as f32;
-        let inline d = 0xa000 as f32 / sqrt(x * x + y * y);
+        let inline d = 40000 as f32 / sqrt(x * x + y * y);
-        let inline a = atan2(x, y) * 163_f; // (512 / pi)
+        let inline u = atan2(x, y) * (512.0 / 3.141);
-        let inline u = i32.trunc_sat_f32_s(a) + t;
+        let inline c = ((i32.trunc_sat_f32_s(d + t * 2 as f32) ^ i32.trunc_sat_f32_s(u + t)) & 255) >> 4;
-        let inline v = i32.trunc_sat_f32_s(d) + t * 2;
-        let inline c = ((v ^ u) #/ 16) % 16;
         i?FRAMEBUFFER = c;
 
         branch_if (i := i + 1) < 320*240: pixels;

examples/tinygo/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+tinygo build -o cart.wasm -target target.json ./main.go
+uw8 filter-exports cart.wasm cart.wasm && \
+#wasm-opt -Oz --fast-math --strip-producers -o cart.wasm cart.wasm && \
+uw8 pack -l 9 cart.wasm cart.uw8

examples/tinygo/main.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"math"
+	"unsafe"
+)
+
+//go:wasm-module env
+//export atan2
+func atan2(x, y float32) float32
+
+//go:wasm-module env
+//export time
+func time() float32
+
+func sqrt(v float32) float32 {
+	return float32(math.Sqrt(float64(v)))
+}
+
+var FRAMEBUFFER = (*[320 * 240]byte)(unsafe.Pointer(uintptr(120)))
+
+//export upd
+func upd() {
+	var i int
+	for i < 320*240 {
+		t := time() * 63.0
+		x := float32(i%320 - 160)
+		y := float32(i/320 - 120)
+		d := float32(40000.0) / sqrt(x*x+y*y)
+		u := atan2(x, y) * 512.0 / 3.141
+		c := uint8((int(d+t*2.0) ^ int(u+t)) >> 4)
+		FRAMEBUFFER[i] = c
+		i++
+	}
+}
+
+func main() {
+}

examples/tinygo/target.json

@@ -0,0 +1,23 @@
+{
+  "llvm-target": "wasm32--wasi",
+  "build-tags": [ "tinygo.wasm" ],
+  "goos": "js",
+  "goarch": "wasm",
+  "linker": "wasm-ld",
+  "libc": "wasi-libc",
+  "cflags": [
+    "--target=wasm32--wasi",
+    "--sysroot={root}/lib/wasi-libc/sysroot",
+    "-Oz"
+  ],
+  "ldflags": [
+    "--no-entry",
+    "--export-all",
+    "--import-memory",
+    "--initial-memory=262144",
+    "--global-base=81920",
+    "-zstack-size=4096",
+    "--strip-all"
+  ],
+  "wasm-abi": "js"
+}

site/content/_index.md

@@ -31,19 +31,19 @@ Examplers for older versions:
 
 ## Versions
 
-### v0.4.1
+### v0.3.0
 
-* [Web runtime](../v0.4.1)
+* [Web runtime](v0.3.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
 
 Changes:
 
-* Windows: fix bad/inconsistent frame rate
+* add blitSprite and grabSprite API calls
-* fix choppy sound on devices with sample rates != 44100 kHz
+* add support for integer scaling up to 16x for printing text
-* add scale mode 'fill' option
+* fix incompatibility with sound devices only offering 16bit audio formats
-
+* add support for br_table instruction in packed carts
 
 ### Older versions
 

site/content/docs.md

@@ -21,7 +21,7 @@ loaded.
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00050: number of frames since module start
+0004c-00050: reserved
 00050-00070: sound data (synced to sound thread)
 00070-00078: reserved
 00078-12c78: frame buffer
@@ -468,7 +468,6 @@ when using the native runtime:
 * `--no-gpu`:  Force old cpu-only window code
 * `--filter FILTER`:  Select an upscale filter at startup
 * `--fullscreen`:  Start in fullscreen mode
-* `--scale-fill`:  Scale to fill whole screen, potentially cropping parts of the frame buffer.
 
 Note that the cpu-only window does not support fullscreen nor upscale filters.
 
@@ -485,7 +484,7 @@ The upscale filter options are:
 5, auto_crt (default)   : ss_crt below 960x720, chromatic_crt otherwise
 ```
 
-You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F. You can toggle between scale modes 'fit' and 'fill' with M.
+You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F.
 
 ## `uw8 pack`
 
@@ -595,7 +594,7 @@ a base module provided by MicroW8.
 
 You can generate this base module yourself using
 `uw8-tool`. As a quick summary, it provides all function
-types with up to 7 parameters (i32 or f32) where the
+types with up to 5 parameters (i32 or f32) where the
 `f32` parameters always preceed the `i32` parameters.
 Then it includes all imports that MicroW8 provides,
 a function section with a single function of type

site/content/versions.md

@@ -2,33 +2,6 @@
 description = "Versions"
 +++
 
-### v0.4.1
-
-* [Web runtime](../v0.4.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
-
-Changes:
-
-* Windows: fix bad/inconsistent frame rate
-* fix choppy sound on devices with sample rates != 44100 kHz
-* add scale mode 'fill' option
-
-### v0.4.0
-
-* [Web runtime](../v0.4.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-windows.zip)
-
-Changes:
-
-* add support for sound on mono- and surround-only devices
-* update wasmtime dependency to fix performance regression in 0.3.0
-* add frame counter since module start at location 72
-* add 6 and 7 parameter function types to base module
-
 ### v0.3.0
 
 * [Web runtime](../v0.3.0)

site/templates/index.html

@@ -4,7 +4,7 @@
         <section>
             <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
         </section>
-        <a href="v0.4.1">
+        <a href="v0.3.0">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/run_native.rs

@@ -27,7 +27,6 @@ struct UW8Instance {
     end_frame: TypedFunc<(), ()>,
     update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
-    frame_counter: u32,
     watchdog: Arc<Mutex<UW8WatchDog>>,
     sound_tx: Option<mpsc::SyncSender<RegisterUpdate>>,
 }
@@ -160,7 +159,6 @@ impl super::Runtime for MicroW8 {
             end_frame,
             update,
             start_time: Instant::now(),
-            frame_counter: 0,
             watchdog,
             sound_tx,
         });
@@ -193,11 +191,8 @@ impl super::Runtime for MicroW8 {
                 let mem = instance.memory.data_mut(&mut instance.store);
                 mem[64..68].copy_from_slice(&time.to_le_bytes());
                 mem[68..72].copy_from_slice(&input.gamepads);
-                mem[72..76].copy_from_slice(&instance.frame_counter.to_le_bytes());
             }
 
-            instance.frame_counter = instance.frame_counter.wrapping_add(1);
-
             instance.store.set_epoch_deadline(self.timeout as u64);
             if let Some(ref update) = instance.update {
                 if let Err(err) = update.call(&mut instance.store, ()) {
@@ -333,8 +328,9 @@ fn init_sound(
     let mut configs: Vec<_> = device
         .supported_output_configs()?
         .filter(|config| {
-            config.sample_format() == cpal::SampleFormat::F32
+            config.channels() <= 2
-                || config.sample_format() == cpal::SampleFormat::I16
+                && (config.sample_format() == cpal::SampleFormat::F32
+                    || config.sample_format() == cpal::SampleFormat::I16)
         })
         .collect();
 
@@ -395,8 +391,8 @@ fn init_sound(
         None
     } else {
         let rs = rubato::FftFixedIn::new(44100, sample_rate, 128, 1, 2)?;
-        let input_buffers = rs.input_buffer_allocate();
+        let input_buffers = rs.input_buffer_allocate(true);
-        let output_buffers = rs.output_buffer_allocate();
+        let output_buffers = rs.output_buffer_allocate(true);
         Some(Resampler {
             resampler: rs,
             input_buffers,
@@ -536,25 +532,6 @@ fn init_sound(
         }
     }
 
-    fn stereo_to_surround<F>(mut buffer: &mut [f32], num_channels: usize, callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut in_buffer = [0f32; 256];
-        buffer.fill(0.);
-
-        while !buffer.is_empty() {
-            let step_size = (buffer.len() / num_channels).min(in_buffer.len() / 2);
-            let step_buffer = &mut in_buffer[..step_size * 2];
-            callback(step_buffer);
-            for index in 0..step_size {
-                buffer[index * num_channels + 0] = step_buffer[index * 2 + 0];
-                buffer[index * num_channels + 1] = step_buffer[index * 2 + 1];
-            }
-            buffer = &mut buffer[step_size * num_channels..];
-        }
-    }
-
     let stream = if sample_format == cpal::SampleFormat::F32 {
         if num_channels == 2 {
             device.build_output_stream(
@@ -565,21 +542,10 @@ fn init_sound(
                 },
                 None,
             )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| stereo_to_mono(buffer, &mut callback),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
         } else {
             device.build_output_stream(
                 &config,
-                move |buffer: &mut [f32], _| {
+                move |buffer: &mut [f32], _| stereo_to_mono(buffer, &mut callback),
-                    stereo_to_surround(buffer, num_channels as usize, &mut callback)
-                },
                 move |err| {
                     dbg!(err);
                 },
@@ -596,24 +562,11 @@ fn init_sound(
                 },
                 None,
             )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| stereo_to_mono(b, &mut callback))
-                },
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
         } else {
             device.build_output_stream(
                 &config,
                 move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| {
+                    f32_to_i16(buffer, &mut |b| stereo_to_mono(b, &mut callback))
-                        stereo_to_surround(b, num_channels as usize, &mut callback)
-                    })
                 },
                 move |err| {
                     dbg!(err);

uw8-tool/src/base_module.rs

@@ -37,7 +37,7 @@ impl BaseModule {
 
         let mut types = vec![];
         let mut type_map = HashMap::new();
-        for num_params in 0..8 {
+        for num_params in 0..6 {
             for num_f32 in 0..=num_params {
                 for &result in &[None, Some(ValType::I32), Some(ValType::F32)] {
                     let mut params = vec![];

uw8-window/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+winit = "0.29.15"
 env_logger = "0.11.3"
-winit = "0.28.6"
 log = "0.4"
 pico-args = "0.5"
-wgpu = "0.17"
+wgpu = "0.19.3"
 pollster = "0.3.0"
 bytemuck = { version = "1.15", features = [ "derive" ] }
 anyhow = "1"

uw8-window/src/gpu/crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct CrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl CrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> CrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -113,9 +112,9 @@ impl CrtFilter {
 }
 
 impl Filter for CrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -127,6 +126,16 @@ impl Filter for CrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        res.width as f32 / scale,
+        res.height as f32 / scale,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/crt.wgsl

@@ -17,7 +17,7 @@ fn vs_main(
     let i = in_vertex_index / 3u + in_vertex_index % 3u;
     let x = -1.0 + f32(i % 2u) * 322.0;
     let y = -1.0 + f32(i / 2u) * 242.0;
-    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) * uniforms.texture_scale.xy, 0.0, 1.0);
+    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) / uniforms.texture_scale.xy, 0.0, 1.0);
     out.tex_coords = vec2<f32>(x, y);
     return out;
 }

uw8-window/src/gpu/fast_crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct FastCrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -16,10 +16,9 @@ impl FastCrtFilter {
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
         chromatic: bool,
-        scale_mode: ScaleMode,
     ) -> FastCrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -132,9 +131,9 @@ impl FastCrtFilter {
 }
 
 impl Filter for FastCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -146,6 +145,16 @@ impl Filter for FastCrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/mod.rs

@@ -1,20 +1,18 @@
 use crate::{Input, WindowConfig, WindowImpl};
 use anyhow::{anyhow, Result};
-use scale_mode::ScaleMode;
+use std::{sync::Arc, time::Instant};
-use std::time::Instant;
 
 use winit::{
     dpi::PhysicalSize,
-    event::{Event, VirtualKeyCode, WindowEvent},
+    event::{Event, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
+    keyboard::{Key, KeyCode, NamedKey, PhysicalKey},
+    platform::pump_events::{EventLoopExtPumpEvents, PumpStatus},
     window::{Fullscreen, WindowBuilder},
 };
 
-use winit::platform::run_return::EventLoopExtRunReturn;
-
 mod crt;
 mod fast_crt;
-pub mod scale_mode;
 mod square;
 
 use crt::CrtFilter;
@@ -23,7 +21,7 @@ use square::SquareFilter;
 
 pub struct Window {
     _instance: wgpu::Instance,
-    surface: wgpu::Surface,
+    surface: wgpu::Surface<'static>,
     _adapter: wgpu::Adapter,
     device: wgpu::Device,
     queue: wgpu::Queue,
@@ -31,18 +29,17 @@ pub struct Window {
     surface_config: wgpu::SurfaceConfiguration,
     filter: Box<dyn Filter>,
     event_loop: EventLoop<()>,
-    window: winit::window::Window,
+    window: Arc<winit::window::Window>,
     gamepads: [u8; 4],
     next_frame: Instant,
     is_fullscreen: bool,
     is_open: bool,
-    scale_mode: ScaleMode,
 }
 
 impl Window {
     pub fn new(window_config: WindowConfig) -> Result<Window> {
         async fn create(window_config: WindowConfig) -> Result<Window> {
-            let event_loop = EventLoop::new();
+            let event_loop = EventLoop::new()?;
             let window = WindowBuilder::new()
                 .with_inner_size(PhysicalSize::new(
                     (320. * window_config.scale).round() as u32,
@@ -59,8 +56,10 @@ impl Window {
 
             window.set_cursor_visible(false);
 
+            let window = Arc::new(window);
+
             let instance = wgpu::Instance::new(Default::default());
-            let surface = unsafe { instance.create_surface(&window) }?;
+            let surface = instance.create_surface(window.clone())?;
             let adapter = instance
                 .request_adapter(&wgpu::RequestAdapterOptions {
                     power_preference: wgpu::PowerPreference::LowPower,
@@ -93,7 +92,6 @@ impl Window {
                 window.inner_size(),
                 surface_config.format,
                 window_config.filter,
-                window_config.scale_mode,
             );
 
             surface.configure(&device, &surface_config);
@@ -113,7 +111,6 @@ impl Window {
                 next_frame: Instant::now(),
                 is_fullscreen: window_config.fullscreen,
                 is_open: true,
-                scale_mode: window_config.scale_mode,
             })
         }
 
@@ -124,103 +121,93 @@ impl Window {
 impl WindowImpl for Window {
     fn begin_frame(&mut self) -> Input {
         let mut reset = false;
-        self.event_loop.run_return(|event, _, control_flow| {
+        self.event_loop
-            *control_flow = ControlFlow::WaitUntil(self.next_frame);
+            .set_control_flow(ControlFlow::WaitUntil(self.next_frame));
-            let mut new_filter = None;
+        while self.is_open {
-            match event {
+            let timeout = self.next_frame.saturating_duration_since(Instant::now());
-                Event::WindowEvent { event, .. } => match event {
+            let status = self.event_loop.pump_events(Some(timeout), |event, elwt| {
-                    WindowEvent::Resized(new_size) => {
+                let mut new_filter = None;
-                        self.surface_config.width = new_size.width;
+                match event {
-                        self.surface_config.height = new_size.height;
+                    Event::WindowEvent { event, .. } => match event {
-                        self.surface.configure(&self.device, &self.surface_config);
+                        WindowEvent::Resized(new_size) => {
-                        self.filter.resize(&self.queue, new_size, self.scale_mode);
+                            self.surface_config.width = new_size.width;
-                    }
+                            self.surface_config.height = new_size.height;
-                    WindowEvent::CloseRequested => {
+                            self.surface.configure(&self.device, &self.surface_config);
-                        self.is_open = false;
+                            self.filter.resize(&self.queue, new_size);
-                        *control_flow = ControlFlow::Exit;
-                    }
-                    WindowEvent::KeyboardInput { input, .. } => {
-                        fn gamepad_button(input: &winit::event::KeyboardInput) -> u8 {
-                            match input.scancode {
-                                44 => 16,
-                                45 => 32,
-                                30 => 64,
-                                31 => 128,
-                                _ => match input.virtual_keycode {
-                                    Some(VirtualKeyCode::Up) => 1,
-                                    Some(VirtualKeyCode::Down) => 2,
-                                    Some(VirtualKeyCode::Left) => 4,
-                                    Some(VirtualKeyCode::Right) => 8,
-                                    _ => 0,
-                                },
-                            }
                         }
-                        if input.state == winit::event::ElementState::Pressed {
+                        WindowEvent::CloseRequested => {
-                            match input.virtual_keycode {
+                            elwt.exit();
-                                Some(VirtualKeyCode::Escape) => {
+                        }
-                                    self.is_open = false;
+                        WindowEvent::KeyboardInput { event, .. } => {
-                                    *control_flow = ControlFlow::Exit;
+                            fn gamepad_button(input: &winit::event::KeyEvent) -> u8 {
+                                match input.physical_key {
+                                    PhysicalKey::Code(KeyCode::KeyZ) => 16,
+                                    PhysicalKey::Code(KeyCode::KeyX) => 32,
+                                    PhysicalKey::Code(KeyCode::KeyA) => 64,
+                                    PhysicalKey::Code(KeyCode::KeyS) => 128,
+                                    _ => match input.logical_key {
+                                        Key::Named(NamedKey::ArrowUp) => 1,
+                                        Key::Named(NamedKey::ArrowDown) => 2,
+                                        Key::Named(NamedKey::ArrowLeft) => 4,
+                                        Key::Named(NamedKey::ArrowRight) => 8,
+                                        _ => 0,
+                                    },
                                 }
-                                Some(VirtualKeyCode::F) => {
-                                    let fullscreen = if self.window.fullscreen().is_some() {
-                                        None
-                                    } else {
-                                        Some(Fullscreen::Borderless(None))
-                                    };
-                                    self.is_fullscreen = fullscreen.is_some();
-                                    self.window.set_fullscreen(fullscreen);
-                                }
-                                Some(VirtualKeyCode::M) => {
-                                    self.scale_mode = match self.scale_mode {
-                                        ScaleMode::Fit => ScaleMode::Fill,
-                                        ScaleMode::Fill => ScaleMode::Fit,
-                                    };
-                                    self.filter.resize(
-                                        &self.queue,
-                                        PhysicalSize {
-                                            width: self.surface_config.width,
-                                            height: self.surface_config.height,
-                                        },
-                                        self.scale_mode,
-                                    );
-                                }
-                                Some(VirtualKeyCode::R) => reset = true,
-                                Some(VirtualKeyCode::Key1) => new_filter = Some(1),
-                                Some(VirtualKeyCode::Key2) => new_filter = Some(2),
-                                Some(VirtualKeyCode::Key3) => new_filter = Some(3),
-                                Some(VirtualKeyCode::Key4) => new_filter = Some(4),
-                                Some(VirtualKeyCode::Key5) => new_filter = Some(5),
-                                _ => (),
                             }
+                            if event.state == winit::event::ElementState::Pressed {
+                                match event.logical_key {
+                                    Key::Named(NamedKey::Escape) => {
+                                        elwt.exit();
+                                    }
+                                    Key::Character(ref c) => match c.as_str() {
+                                        "f" => {
+                                            let fullscreen = if self.window.fullscreen().is_some() {
+                                                None
+                                            } else {
+                                                Some(Fullscreen::Borderless(None))
+                                            };
+                                            self.is_fullscreen = fullscreen.is_some();
+                                            self.window.set_fullscreen(fullscreen);
+                                        }
+                                        "r" => reset = true,
+                                        "1" => new_filter = Some(1),
+                                        "2" => new_filter = Some(2),
+                                        "3" => new_filter = Some(3),
+                                        "4" => new_filter = Some(4),
+                                        "5" => new_filter = Some(5),
+                                        _ => (),
+                                    },
+                                    _ => (),
+                                }
 
-                            self.gamepads[0] |= gamepad_button(&input);
+                                self.gamepads[0] |= gamepad_button(&event);
-                        } else {
+                            } else {
-                            self.gamepads[0] &= !gamepad_button(&input);
+                                self.gamepads[0] &= !gamepad_button(&event);
+                            }
                         }
-                    }
+                        _ => (),
+                    },
                     _ => (),
-                },
-                Event::RedrawEventsCleared => {
-                    if Instant::now() >= self.next_frame
-                        // workaround needed on Wayland until the next winit release
-                        && self.window.fullscreen().is_some() == self.is_fullscreen
-                    {
-                        *control_flow = ControlFlow::Exit
-                    }
                 }
+                if let Some(new_filter) = new_filter {
+                    self.filter = create_filter(
+                        &self.device,
+                        &self.palette_screen_mode.screen_view,
+                        self.window.inner_size(),
+                        self.surface_config.format,
+                        new_filter,
+                    );
+                }
+            });
+            match status {
+                PumpStatus::Exit(_) => self.is_open = false,
                 _ => (),
             }
-            if let Some(new_filter) = new_filter {
+
-                self.filter = create_filter(
+            if Instant::now() >= self.next_frame {
-                    &self.device,
+                break;
-                    &self.palette_screen_mode.screen_view,
-                    self.window.inner_size(),
-                    self.surface_config.format,
-                    new_filter,
-                    self.scale_mode,
-                );
             }
-        });
+        }
         Input {
             gamepads: self.gamepads,
             reset,
@@ -256,10 +243,12 @@ impl WindowImpl for Window {
                             b: 0.0,
                             a: 1.0,
                         }),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
                 })],
                 depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
             });
 
             self.filter.render(&mut render_pass);
@@ -280,7 +269,6 @@ fn create_filter(
     window_size: PhysicalSize<u32>,
     surface_format: wgpu::TextureFormat,
     filter: u32,
-    scale_mode: ScaleMode,
 ) -> Box<dyn Filter> {
     match filter {
         1 => Box::new(SquareFilter::new(
@@ -288,7 +276,6 @@ fn create_filter(
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         2 => Box::new(FastCrtFilter::new(
             device,
@@ -296,14 +283,12 @@ fn create_filter(
             window_size,
             surface_format,
             false,
-            scale_mode,
         )),
         3 => Box::new(CrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         4 => Box::new(FastCrtFilter::new(
             device,
@@ -311,20 +296,18 @@ fn create_filter(
             window_size,
             surface_format,
             true,
-            scale_mode,
         )),
         _ => Box::new(AutoCrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
     }
 }
 
 trait Filter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode);
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>);
     fn render<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>);
 }
 
@@ -340,11 +323,9 @@ impl AutoCrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> AutoCrtFilter {
-        let small = CrtFilter::new(device, screen, resolution, surface_format, scale_mode);
+        let small = CrtFilter::new(device, screen, resolution, surface_format);
-        let large =
+        let large = FastCrtFilter::new(device, screen, resolution, surface_format, true);
-            FastCrtFilter::new(device, screen, resolution, surface_format, true, scale_mode);
         AutoCrtFilter {
             small,
             large,
@@ -354,9 +335,9 @@ impl AutoCrtFilter {
 }
 
 impl Filter for AutoCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
-        self.small.resize(queue, new_size, scale_mode);
+        self.small.resize(queue, new_size);
-        self.large.resize(queue, new_size, scale_mode);
+        self.large.resize(queue, new_size);
         self.resolution = new_size;
     }
 
@@ -569,10 +550,12 @@ impl PaletteScreenMode {
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Load,
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 },
             })],
             depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         render_pass.set_pipeline(&self.pipeline);

uw8-window/src/gpu/scale_mode.rs

@@ -1,28 +0,0 @@
-use winit::dpi::PhysicalSize;
-
-#[derive(Debug, Copy, Clone)]
-pub enum ScaleMode {
-    Fit,
-    Fill,
-}
-
-impl Default for ScaleMode {
-    fn default() -> ScaleMode {
-        ScaleMode::Fit
-    }
-}
-
-impl ScaleMode {
-    pub fn texture_scale_from_resolution(&self, res: PhysicalSize<u32>) -> [f32; 4] {
-        let scale = match self {
-            ScaleMode::Fit => ((res.width as f32) / 160.0).min((res.height as f32) / 120.0),
-            ScaleMode::Fill => ((res.width as f32) / 160.0).max((res.height as f32) / 120.0),
-        };
-        [
-            scale / res.width as f32,
-            scale / res.height as f32,
-            2.0 / scale,
-            0.0,
-        ]
-    }
-}

uw8-window/src/gpu/square.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct SquareFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl SquareFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> SquareFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -127,9 +126,9 @@ impl SquareFilter {
 }
 
 impl Filter for SquareFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -141,6 +140,16 @@ impl Filter for SquareFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/lib.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use gpu::scale_mode::ScaleMode;
 use std::time::Instant;
 
 mod cpu;
@@ -74,7 +73,6 @@ pub struct WindowConfig {
     fullscreen: bool,
     fps_counter: bool,
     scale: f32,
-    scale_mode: ScaleMode,
 }
 
 impl Default for WindowConfig {
@@ -85,7 +83,6 @@ impl Default for WindowConfig {
             fullscreen: false,
             fps_counter: false,
             scale: 2.,
-            scale_mode: ScaleMode::Fit,
         }
     }
 }
@@ -112,9 +109,6 @@ impl WindowConfig {
             .opt_value_from_str("--scale")
             .unwrap()
             .unwrap_or(self.scale);
-        if args.contains("--scale-fill") {
-            self.scale_mode = ScaleMode::Fill;
-        }
     }
 }
 

web/src/index.html

@@ -10,7 +10,7 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.4.1
+            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.3.0
         </div>
         <div id="centered">
             <canvas class="screen" id="screen" width="320" height="240">

web/src/microw8.js

@@ -240,7 +240,6 @@ export default function MicroW8(screen, config = {}) {
             await audioReadyPromise;
     
             let startTime = Date.now();
-            let frameCounter = 0;
     
             const timePerFrame = 1000 / 60;
 
@@ -307,7 +306,6 @@ export default function MicroW8(screen, config = {}) {
                         let time = Date.now() - startTime;
                         u32Mem[16] = time;
                         u32Mem[17] = pad | gamepad;
-                        u32Mem[18] = frameCounter++;
                         if(instance.exports.upd) {
                             instance.exports.upd();
                         }