From 069d7cdc98604867b3e2f37e22a5ebe3c25e7279 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Sun, 16 Feb 2020 21:49:56 -0500 Subject: [PATCH] [rs] wgpu update with DynamicOffset --- wgpu/Cargo.toml | 4 ++-- wgpu/src/lib.rs | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 4279b79af8..0b0ee2163a 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -27,14 +27,14 @@ vulkan = ["wgn/vulkan-portability"] package = "wgpu-native" version = "0.4" git = "https://github.com/gfx-rs/wgpu" -rev = "d4a46cb60e71d6b108e9052cc581e52e44a16a44" +rev = "f2323f2b23b7dbe060d324266cf6c1c864152e91" #path = "../wgpu/wgpu-native" [dependencies.wgc] package = "wgpu-core" version = "0.1" git = "https://github.com/gfx-rs/wgpu" -rev = "d4a46cb60e71d6b108e9052cc581e52e44a16a44" +rev = "f2323f2b23b7dbe060d324266cf6c1c864152e91" #path = "../wgpu/wgpu-core" [dependencies] diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index f11ba0e115..7e07e55bc0 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -73,6 +73,7 @@ pub use wgc::{ swap_chain::{PresentMode, SwapChainDescriptor}, BufferAddress, Color, + DynamicOffset, Extent3d, Origin3d, }; @@ -561,7 +562,7 @@ impl Adapter { } pub fn get_info(&self) -> AdapterInfo { - wgn::wgpu_adapter_get_info(self.id) + wgn::adapter_get_info(self.id) } } @@ -1119,7 +1120,9 @@ impl CommandEncoder { /// This function returns a [`ComputePass`] object which records a single compute pass. pub fn begin_compute_pass(&mut self) -> ComputePass { ComputePass { - id: wgn::wgpu_command_encoder_begin_compute_pass(self.id, None), + id: unsafe { + wgn::wgpu_command_encoder_begin_compute_pass(self.id, None) + }, _parent: self, } } @@ -1195,7 +1198,7 @@ impl<'a> RenderPass<'a> { &mut self, index: u32, bind_group: &'a BindGroup, - offsets: &[BufferAddress], + offsets: &[DynamicOffset], ) { unsafe { wgn::wgpu_render_pass_set_bind_group( @@ -1387,7 +1390,7 @@ impl<'a> ComputePass<'a> { &mut self, index: u32, bind_group: &'a BindGroup, - offsets: &[BufferAddress], + offsets: &[DynamicOffset], ) { unsafe { wgn::wgpu_compute_pass_set_bind_group(