diff --git a/hui-examples/Cargo.toml b/hui-examples/Cargo.toml index 4521a28..aff99bb 100644 --- a/hui-examples/Cargo.toml +++ b/hui-examples/Cargo.toml @@ -13,7 +13,7 @@ hui-winit = { path = "../hui-winit" } kubi-logging = { git = "https://github.com/griffi-gh/kubi", rev = "be1e24ba0c9e6d24128e7d0e74bebd8b90c23be7" } glium = "0.35" winit = "0.30" -glam = "0.28" +glam = "0.29" log = "0.4" image = { version = "0.25", features = ["jpeg", "png"] } diff --git a/hui-glium/Cargo.toml b/hui-glium/Cargo.toml index 3a8dbba..613434f 100644 --- a/hui-glium/Cargo.toml +++ b/hui-glium/Cargo.toml @@ -17,6 +17,6 @@ include = [ [dependencies] hui = { version = "=0.1.0-alpha.5", path = "../hui", default-features = false } -glium = { version = "0.35", default-features = false } -glam = "0.28" +glium = { version = "0.36", default-features = false } +glam = "0.29" log = "0.4" diff --git a/hui-painter/Cargo.toml b/hui-painter/Cargo.toml index c5eef95..8500980 100644 --- a/hui-painter/Cargo.toml +++ b/hui-painter/Cargo.toml @@ -16,7 +16,7 @@ include = [ [dependencies] hui-shared = { version = "0.1.0-alpha.5", path = "../hui-shared" } -glam = "0.28" +glam = "0.29" log = "0.4" rect_packer = "0.2" # TODO: use sth else like `crunch` instead? hashbrown = "0.14" diff --git a/hui-shared/Cargo.toml b/hui-shared/Cargo.toml index 8896e63..b0045d0 100644 --- a/hui-shared/Cargo.toml +++ b/hui-shared/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0-alpha.5" edition = "2021" [dependencies] -glam = "0.28" +glam = "0.29" diff --git a/hui-wgpu/Cargo.toml b/hui-wgpu/Cargo.toml index d2c717e..3a9206e 100644 --- a/hui-wgpu/Cargo.toml +++ b/hui-wgpu/Cargo.toml @@ -17,7 +17,7 @@ include = [ [dependencies] hui = { version = "=0.1.0-alpha.5", path = "../hui", default-features = false } -wgpu = { version = "0.20", default-features = false, features = ["wgsl"]} +wgpu = { version = "23", default-features = false, features = ["wgsl"]} bytemuck = "1.15" log = "0.4" -glam = "0.28" +glam = "0.29" diff --git a/hui-wgpu/src/lib.rs b/hui-wgpu/src/lib.rs index 8f48418..91dcdf2 100644 --- a/hui-wgpu/src/lib.rs +++ b/hui-wgpu/src/lib.rs @@ -155,13 +155,13 @@ impl WgpuUiRenderer { vertex: wgpu::VertexState { module: &shader_module, compilation_options: wgpu::PipelineCompilationOptions::default(), - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[WgpuVertex::LAYOUT], }, fragment: Some(wgpu::FragmentState { module: &shader_module, compilation_options: wgpu::PipelineCompilationOptions::default(), - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format: surface_format, blend: Some(wgpu::BlendState::ALPHA_BLENDING), @@ -180,6 +180,7 @@ impl WgpuUiRenderer { depth_stencil: None, multisample: wgpu::MultisampleState::default(), multiview: None, + cache: None, }); Self { diff --git a/hui-winit/Cargo.toml b/hui-winit/Cargo.toml index 8354f6f..0d171cb 100644 --- a/hui-winit/Cargo.toml +++ b/hui-winit/Cargo.toml @@ -18,7 +18,7 @@ hui = { version = "=0.1.0-alpha.5", path = "../hui", default-features = false } winit = { version = "0.30", default-features = false } # winit_30 = { package = "winit", version = "0.30", default-features = false, optional = true } # winit_29 = { package = "winit", version = "0.29", default-features = false, optional = true } -glam = "0.28" +glam = "0.29" log = "0.4" [features]