diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index ddadf433a2..16831dcf74 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -31,7 +31,6 @@ arrayvec = "0.7" bitflags = "1.0" bit-vec = "0.6" codespan-reporting = "0.11" -copyless = "0.1" fxhash = "0.2" log = "0.4" # parking_lot 0.12 switches from `winapi` to `windows`; permit either diff --git a/wgpu-core/src/device/life.rs b/wgpu-core/src/device/life.rs index 2cb5703289..c06349dc4f 100644 --- a/wgpu-core/src/device/life.rs +++ b/wgpu-core/src/device/life.rs @@ -12,7 +12,6 @@ use crate::{ }; use smallvec::SmallVec; -use copyless::VecHelper as _; use hal::Device as _; use parking_lot::Mutex; use thiserror::Error; @@ -339,7 +338,7 @@ impl LifetimeTracker { } } - self.active.alloc().init(ActiveSubmission { + self.active.push(ActiveSubmission { index, last_resources, mapped: Vec::new(), diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index a582f6733f..b3674170c4 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -18,7 +18,6 @@ use crate::{ }; use arrayvec::ArrayVec; -use copyless::VecHelper as _; use hal::{CommandEncoder as _, Device as _}; use parking_lot::{Mutex, MutexGuard}; use smallvec::SmallVec; @@ -2518,7 +2517,7 @@ impl Device { let mut vertex_buffers = Vec::with_capacity(desc.vertex.buffers.len()); let mut total_attributes = 0; for (i, vb_state) in desc.vertex.buffers.iter().enumerate() { - vertex_steps.alloc().init(pipeline::VertexStep { + vertex_steps.push(pipeline::VertexStep { stride: vb_state.array_stride, mode: vb_state.step_mode, }); @@ -2538,7 +2537,7 @@ impl Device { stride: vb_state.array_stride, }); } - vertex_buffers.alloc().init(hal::VertexBufferLayout { + vertex_buffers.push(hal::VertexBufferLayout { array_stride: vb_state.array_stride, step_mode: vb_state.step_mode, attributes: vb_state.attributes.as_ref(),