Merge canonical main after the wgpu 30 upgrade

core/src/render/mod.rs

@@ -186,8 +186,8 @@ impl UiRenderNode {
         for source in &registry.sources()[self.primitives.len()..] {
             let render = (source.render)(device, queue);
             let data_layout = Self::data_layout(device, source.stride);
-            let mut groups = vec![&self.shared_layout, &data_layout];
-            groups.extend(render.layout());
+            let mut groups = vec![Some(&self.shared_layout), Some(&data_layout)];
+            groups.extend(render.layout().map(Some));
             let layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
                 label: Some(source.label),
                 bind_group_layouts: &groups,
@@ -219,7 +219,7 @@ impl UiRenderNode {
             vertex: VertexState {
                 module: &module,
                 entry_point: Some("vs_main"),
-                buffers: &[PrimitiveInstance::desc()],
+                buffers: &[Some(PrimitiveInstance::desc())],
                 compilation_options: Default::default(),
             },
             fragment: Some(FragmentState {