update stuff

Cargo.toml

@@ -28,9 +28,9 @@ version = "0.1.0"
 edition = "2024"
 
 [workspace.dependencies]
-pollster = "0.4.0"
+pollster = "1.0.1"
 winit = "0.30.12"
-wgpu = "28.0.0"
+wgpu = "30.0.0"
 bytemuck = "1.23.1"
 image = "0.25.6"
 cosmic-text = "0.16.0"

core/src/render/mod.rs

@@ -188,7 +188,7 @@ impl UiRenderNode {
 
         let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
             label: Some("UI Shape Pipeline Layout"),
-            bind_group_layouts: &[&uniform_layout, &primitive_layout, &rsc_layout],
+            bind_group_layouts: &[&uniform_layout, &primitive_layout, &rsc_layout].map(Some),
             immediate_size: 0,
         });
         let pipeline = device.create_render_pipeline(&RenderPipelineDescriptor {
@@ -197,7 +197,7 @@ impl UiRenderNode {
             vertex: VertexState {
                 module: &shader,
                 entry_point: Some("vs_main"),
-                buffers: &[PrimitiveInstance::desc()],
+                buffers: &[Some(PrimitiveInstance::desc())],
                 compilation_options: Default::default(),
             },
             fragment: Some(FragmentState {

core/src/render/shader.wgsl

@@ -1,3 +1,5 @@
+enable wgpu_binding_array;
+
 const RECT: u32 = 0u;
 const TEXTURE: u32 = 1u;
 
@@ -65,9 +67,9 @@ struct VertexOutput {
     @location(0) top_left: vec2<f32>,
     @location(1) bot_right: vec2<f32>,
     @location(2) uv: vec2<f32>,
-    @location(3) binding: u32,
+    @location(3) @interpolate(flat) binding: u32,
-    @location(4) idx: u32,
+    @location(4) @interpolate(flat) idx: u32,
-    @location(5) mask_idx: u32,
+    @location(5) @interpolate(flat) mask_idx: u32,
     @builtin(position) clip_position: vec4<f32>,
 };
 

macro/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 [dependencies]
 proc-macro2 = "1.0.103"
 quote = "1.0.42"
-syn = { version = "2.0.111", features = ["full"] }
+syn = { version = "3.0.3", features = ["full"] }
 
 [lib]
 proc-macro = true

src/default/render.rs

@@ -22,7 +22,11 @@ impl UiRenderer {
     }
 
     pub fn draw(&mut self) {
-        let output = self.surface.get_current_texture().unwrap();
+        let output = match self.surface.get_current_texture() {
+            CurrentSurfaceTexture::Success(v) => v,
+            CurrentSurfaceTexture::Suboptimal(v) => v,
+            _ => panic!("failed"),
+        };
         let view = output
             .texture
             .create_view(&TextureViewDescriptor::default());
@@ -45,7 +49,7 @@ impl UiRenderer {
         }
 
         self.queue.submit(std::iter::once(encoder.finish()));
-        output.present();
+        self.queue.present(output);
     }
 
     pub fn resize(&mut self, size: &PhysicalSize<u32>) {
@@ -64,9 +68,12 @@ impl UiRenderer {
     pub fn new(window: Arc<Window>) -> Self {
         let size = window.inner_size();
 
-        let instance = Instance::new(&InstanceDescriptor {
+        let instance = Instance::new(InstanceDescriptor {
             backends: Backends::PRIMARY,
-            ..Default::default()
+            flags: Default::default(),
+            memory_budget_thresholds: Default::default(),
+            backend_options: Default::default(),
+            display: None,
         });
 
         let surface = instance
@@ -78,6 +85,7 @@ impl UiRenderer {
                 power_preference: PowerPreference::default(),
                 compatible_surface: Some(&surface),
                 force_fallback_adapter: false,
+                apply_limit_buckets: false,
             })
             .block_on()
             .expect("Could not get adapter!");
@@ -119,6 +127,7 @@ impl UiRenderer {
             alpha_mode: surface_caps.alpha_modes[0],
             desired_maximum_frame_latency: 2,
             view_formats: vec![],
+            color_space: Default::default(),
         };
 
         surface.configure(&device, &config);