Skip to content

Commit

Permalink
remove copyless (#3050)
Browse files Browse the repository at this point in the history
  • Loading branch information
SpecificProtagonist authored Sep 26, 2022
1 parent 27a2756 commit b65ebb4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions wgpu-core/src/device/life.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::{
};
use smallvec::SmallVec;

use copyless::VecHelper as _;
use hal::Device as _;
use parking_lot::Mutex;
use thiserror::Error;
Expand Down Expand Up @@ -339,7 +338,7 @@ impl<A: hal::Api> LifetimeTracker<A> {
}
}

self.active.alloc().init(ActiveSubmission {
self.active.push(ActiveSubmission {
index,
last_resources,
mapped: Vec::new(),
Expand Down
5 changes: 2 additions & 3 deletions wgpu-core/src/device/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2518,7 +2517,7 @@ impl<A: HalApi> Device<A> {
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,
});
Expand All @@ -2538,7 +2537,7 @@ impl<A: HalApi> Device<A> {
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(),
Expand Down

0 comments on commit b65ebb4

Please sign in to comment.