Merge branch 'master' into feature/panes-widget

2020-03-05 02:04:03 +01:00 · 2020-03-05 02:04:03 +01:00 · 85ee2fc65a
commit 85ee2fc65a
parent cc310f71cc 3062c190bb
1 changed files with 8 additions and 3 deletions
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@ -330,12 +330,17 @@ impl Pipeline {
                    &[(std::mem::size_of::<Uniforms>() * i) as u64],
                );

-                render_pass
-                    .set_index_buffer(&self.index_buffer.raw, index_offset);
+                render_pass.set_index_buffer(
+                    &self.index_buffer.raw,
+                    index_offset * std::mem::size_of::<u32>() as u64,
+                );

                render_pass.set_vertex_buffers(
                    0,
-                    &[(&self.vertex_buffer.raw, vertex_offset)],
+                    &[(
+                        &self.vertex_buffer.raw,
+                        vertex_offset * std::mem::size_of::<Vertex2D>() as u64,
+                    )],
                );

                render_pass.draw_indexed(0..indices as u32, 0, 0..1);