diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60f7858b..27bddef3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,9 +79,9 @@ jobs: targets: ${{ matrix.platform.target }} components: clippy, rust-src - - name: Install libwayland + - name: Install libwayland and xkbcommon if: (matrix.platform.os == 'ubuntu-latest') - run: sudo apt-get update && sudo apt-get install libwayland-dev + run: sudo apt-get update && sudo apt-get install libwayland-dev libxkbcommon-x11-dev - name: Install GCC Multilib if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686') diff --git a/Cargo.toml b/Cargo.toml index de77299f..708ee575 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,7 +80,7 @@ colorous = "1.0.12" criterion = { version = "0.4.0", default-features = false, features = ["cargo_bench_support"] } instant = "0.1.12" winit = "0.29.2" -winit-test = "0.1.0" +winit-test = "0.2.0" [dev-dependencies.image] version = "0.24.6" diff --git a/tests/present_and_fetch.rs b/tests/present_and_fetch.rs index 9e87c043..f86633bf 100644 --- a/tests/present_and_fetch.rs +++ b/tests/present_and_fetch.rs @@ -1,29 +1,20 @@ -// TODO: Once winit is updated again, restore this test. -/* use softbuffer::{Context, Surface}; use std::num::NonZeroU32; use winit::event_loop::EventLoopWindowTarget; fn all_red(elwt: &EventLoopWindowTarget<()>) { - let window = winit::window::WindowBuilder::new() - .with_title("all_red") - .build(elwt) - .unwrap(); + #[cfg_attr(not(target_arch = "wasm32"), allow(unused_mut))] + let mut builder = winit::window::WindowBuilder::new().with_title("all_red"); #[cfg(target_arch = "wasm32")] { - use winit::platform::web::WindowExtWebSys; - - web_sys::window() - .unwrap() - .document() - .unwrap() - .body() - .unwrap() - .append_child(&window.canvas()) - .unwrap(); + use winit::platform::web::WindowBuilderExtWebSys; + + builder = builder.with_append(true); } + let window = builder.build(elwt).unwrap(); + // winit does not wait for the window to be mapped... sigh #[cfg(not(target_arch = "wasm32"))] std::thread::sleep(std::time::Duration::from_millis(1)); @@ -56,6 +47,3 @@ fn all_red(elwt: &EventLoopWindowTarget<()>) { } winit_test::main!(all_red); -*/ - -fn main() {}