nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-26 08:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Update to latest wgpu-native

Browse Source
This commit is contained in:
Rukai 2019-06-07 20:36:04 +10:00
parent fe901fc7c2
commit d25966f960
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu/Cargo.toml
View File

@ -23,7 +23,7 @@ vulkan = ["wgn/gfx-backend-vulkan"]
[dependencies] [dependencies]
#TODO: only depend on the published version #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" arrayvec = "0.4"
[dev-dependencies] [dev-dependencies]

6
wgpu/src/lib.rs
View File

@ -634,7 +634,7 @@ impl Device {
stride: vbuf.stride, stride: vbuf.stride,
step_mode: vbuf.step_mode, step_mode: vbuf.step_mode,
attributes: vbuf.attributes.as_ptr(), attributes: vbuf.attributes.as_ptr(),
attributes_count: vbuf.attributes.len(), attributes_length: vbuf.attributes.len(),
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -656,7 +656,7 @@ impl Device {
vertex_input: wgn::VertexInputDescriptor { vertex_input: wgn::VertexInputDescriptor {
index_format: desc.index_format, index_format: desc.index_format,
vertex_buffers: temp_vertex_buffers.as_ptr(), 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, sample_count: desc.sample_count,
}, },
@ -973,7 +973,7 @@ impl CommandEncoder {
RenderPass { RenderPass {
id: wgn::wgpu_command_encoder_begin_render_pass( id: wgn::wgpu_command_encoder_begin_render_pass(
self.id, self.id,
wgn::RenderPassDescriptor { &wgn::RenderPassDescriptor {
color_attachments: colors.as_ptr(), color_attachments: colors.as_ptr(),
color_attachments_length: colors.len(), color_attachments_length: colors.len(),
depth_stencil_attachment: depth_stencil depth_stencil_attachment: depth_stencil