summaryrefslogtreecommitdiffstats
path: root/wgpu/src/triangle.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2020-11-11 18:06:27 +0100
committerLibravatar GitHub <noreply@github.com>2020-11-11 18:06:27 +0100
commit73811c394a39c3816c67bffd2cf7d7a93c8803a9 (patch)
treebabd079fff2163d147d3d2cec429b17d04a1af9c /wgpu/src/triangle.rs
parent2f5a3dacd933a52931a1bb169138d52402413956 (diff)
parent0400f6716bfb7bcae7d7e464e79e400f3ccc2368 (diff)
downloadiced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.tar.gz
iced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.tar.bz2
iced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.zip
Merge pull request #610 from hecrj/improvement/update-dependencies
Update dependencies
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`...