From a00c8f35603461b02ba90ce27efc3dc2ef527856 Mon Sep 17 00:00:00 2001 From: Diggory Hardy Date: Wed, 24 Jan 2024 09:12:13 +0000 Subject: [PATCH] Fix tests and examples --- crates/kas-core/src/app/mod.rs | 31 ++++++++++++++++++++++--------- examples/mandlebrot/mandlebrot.rs | 4 ++-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/crates/kas-core/src/app/mod.rs b/crates/kas-core/src/app/mod.rs index 134e86735..393ab8fe4 100644 --- a/crates/kas-core/src/app/mod.rs +++ b/crates/kas-core/src/app/mod.rs @@ -248,14 +248,6 @@ mod test { impl WindowSurface for Surface { type Shared = DrawShared; - fn new(_: &mut Self::Shared, _: W) -> Result - where - W: rwh::HasRawWindowHandle + rwh::HasRawDisplayHandle, - Self: Sized, - { - todo!() - } - fn size(&self) -> crate::prelude::Size { todo!() } @@ -280,10 +272,31 @@ mod test { } } + struct AGB; + impl AppGraphicsBuilder for AGB { + type DefaultTheme = crate::theme::SimpleTheme; + + type Shared = DrawShared; + + type Surface<'a> = Surface; + + fn build(self) -> Result { + todo!() + } + + fn new_surface<'window, W>(_: &mut Self::Shared, _: W) -> Result> + where + W: rwh::HasWindowHandle + rwh::HasDisplayHandle + Send + Sync + 'window, + Self: Sized, + { + todo!() + } + } + #[test] fn size_of_pending() { assert_eq!( - std::mem::size_of::>(), + std::mem::size_of::>(), 32 ); } diff --git a/examples/mandlebrot/mandlebrot.rs b/examples/mandlebrot/mandlebrot.rs index ebb2b1456..e44e36bb9 100644 --- a/examples/mandlebrot/mandlebrot.rs +++ b/examples/mandlebrot/mandlebrot.rs @@ -101,8 +101,8 @@ impl CustomPipeBuilder for PipeBuilder { fn device_descriptor() -> wgpu::DeviceDescriptor<'static> { wgpu::DeviceDescriptor { label: None, - features: wgpu::Features::PUSH_CONSTANTS | SHADER_FLOAT64, - limits: wgpu::Limits { + required_features: wgpu::Features::PUSH_CONSTANTS | SHADER_FLOAT64, + required_limits: wgpu::Limits { max_push_constant_size: size_of::().cast(), ..Default::default() },