From d25966f960a81248b0c4b4f97ddebaacf1833f04 Mon Sep 17 00:00:00 2001 From: Rukai Date: Fri, 7 Jun 2019 20:36:04 +1000 Subject: [PATCH] [rs] Update to latest wgpu-native --- wgpu/Cargo.toml | 2 +- wgpu/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index cfdac426b7..042cd7e47c 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -23,7 +23,7 @@ vulkan = ["wgn/gfx-backend-vulkan"] [dependencies] #TODO: only depend on the published version -wgn = { package = "wgpu-native", features = ["local", "window-winit"], git = "https://github.com/gfx-rs/wgpu", rev = "803c607794c64feeab66d066d5f748f49005d0b4" } +wgn = { package = "wgpu-native", features = ["local", "window-winit"], git = "https://github.com/gfx-rs/wgpu", rev = "8cc50253c428fb0a9aab3c74639a866465d65272" } arrayvec = "0.4" [dev-dependencies] diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index 8ef3a71a16..0590a67a4d 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -634,7 +634,7 @@ impl Device { stride: vbuf.stride, step_mode: vbuf.step_mode, attributes: vbuf.attributes.as_ptr(), - attributes_count: vbuf.attributes.len(), + attributes_length: vbuf.attributes.len(), }) .collect::>(); @@ -656,7 +656,7 @@ impl Device { vertex_input: wgn::VertexInputDescriptor { index_format: desc.index_format, vertex_buffers: temp_vertex_buffers.as_ptr(), - vertex_buffers_count: temp_vertex_buffers.len(), + vertex_buffers_length: temp_vertex_buffers.len(), }, sample_count: desc.sample_count, }, @@ -973,7 +973,7 @@ impl CommandEncoder { RenderPass { id: wgn::wgpu_command_encoder_begin_render_pass( self.id, - wgn::RenderPassDescriptor { + &wgn::RenderPassDescriptor { color_attachments: colors.as_ptr(), color_attachments_length: colors.len(), depth_stencil_attachment: depth_stencil