summaryrefslogtreecommitdiffstats
path: root/wgpu/src/triangle.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-11-10 20:06:24 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-11-10 20:06:24 +0100
commit9d4f664c946e6475eaf2e8719ba56beee84a8fb8 (patch)
treef76ca213383363b60988a9f92078b7dbf14a6fa1 /wgpu/src/triangle.rs
parentb86accfe1cdc0a4404416eb3c68aa3cf9c242f6a (diff)
downloadiced-9d4f664c946e6475eaf2e8719ba56beee84a8fb8.tar.gz
iced-9d4f664c946e6475eaf2e8719ba56beee84a8fb8.tar.bz2
iced-9d4f664c946e6475eaf2e8719ba56beee84a8fb8.zip
Update `bytemuck` and remove `zerocopy` in `iced_wgpu`
Diffstat (limited to 'wgpu/src/triangle.rs')
-rw-r--r--wgpu/src/triangle.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 53ce454b..61a771d8 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,8 +1,9 @@
//! Draw meshes of triangles.
use crate::{settings, Transformation};
use iced_graphics::layer;
+
+use bytemuck::{Pod, Zeroable};
use std::mem;
-use zerocopy::AsBytes;
pub use iced_graphics::triangle::{Mesh2D, Vertex2D};
@@ -322,7 +323,7 @@ impl Pipeline {
}
}
- let uniforms = uniforms.as_bytes();
+ let uniforms = bytemuck::cast_slice(&uniforms);
if let Some(uniforms_size) =
wgpu::BufferSize::new(uniforms.len() as u64)
@@ -409,7 +410,7 @@ impl Pipeline {
}
#[repr(C)]
-#[derive(Debug, Clone, Copy, AsBytes)]
+#[derive(Debug, Clone, Copy, Zeroable, Pod)]
struct Uniforms {
transform: [f32; 16],
// We need to align this to 256 bytes to please `wgpu`...