summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-02-14 05:42:19 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-02-14 05:42:19 +0100
commitf5c80a6d75d5022b175d3562f0965598b6398bd7 (patch)
treea97a21b78569945660c4406f9d26ac3a5dac5d35
parent945dfabd7135d1bd44a14e54d95b716642651ed3 (diff)
downloadiced-f5c80a6d75d5022b175d3562f0965598b6398bd7.tar.gz
iced-f5c80a6d75d5022b175d3562f0965598b6398bd7.tar.bz2
iced-f5c80a6d75d5022b175d3562f0965598b6398bd7.zip
Upgrade `Mesh2D` indices from `u16` to `u32`
Diffstat (limited to '')
-rw-r--r--examples/bezier_tool/src/main.rs2
-rw-r--r--wgpu/src/triangle.rs4
-rw-r--r--wgpu/src/widget/canvas/frame.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
index fbb6fa24..efdb3924 100644
--- a/examples/bezier_tool/src/main.rs
+++ b/examples/bezier_tool/src/main.rs
@@ -94,7 +94,7 @@ mod bezier {
layout: Layout<'_>,
cursor_position: Point,
) -> (Primitive, MouseCursor) {
- let mut buffer: VertexBuffers<Vertex2D, u16> = VertexBuffers::new();
+ let mut buffer: VertexBuffers<Vertex2D, u32> = VertexBuffers::new();
let mut path_builder = lyon::path::Path::builder();
let bounds = layout.bounds();
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 6f3adbe4..3cc1d3fb 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -91,7 +91,7 @@ impl Pipeline {
write_mask: wgpu::ColorWrite::ALL,
}],
depth_stencil_state: None,
- index_format: wgpu::IndexFormat::Uint16,
+ index_format: wgpu::IndexFormat::Uint32,
vertex_buffers: &[wgpu::VertexBufferDescriptor {
stride: mem::size_of::<Vertex2D>() as u64,
step_mode: wgpu::InputStepMode::Vertex,
@@ -233,5 +233,5 @@ pub struct Mesh2D {
/// The list of vertex indices that defines the triangles of the mesh.
///
/// Therefore, this list should always have a length that is a multiple of 3.
- pub indices: Vec<u16>,
+ pub indices: Vec<u32>,
}
diff --git a/wgpu/src/widget/canvas/frame.rs b/wgpu/src/widget/canvas/frame.rs
index 687f6c37..27d676d6 100644
--- a/wgpu/src/widget/canvas/frame.rs
+++ b/wgpu/src/widget/canvas/frame.rs
@@ -9,7 +9,7 @@ use crate::{
pub struct Frame {
width: f32,
height: f32,
- buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u16>,
+ buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>,
transforms: Transforms,
}