github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgdate to latest wgpu-native

Browse Source
This commit is contained in:
Lucas Kent
2019-05-27 17:36:05 +10:00
committed by Rukai
parent 91bb4c8f53
commit 0161b0867f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -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 = "5b6549febccdc93f344a2b776b9a548b17afcf2f" }
wgn = { package = "wgpu-native", features = ["local", "window-winit"], git = "https://github.com/gfx-rs/wgpu", rev = "ce4ef375c342446d3019a12c10203042d3f5ba11" }
arrayvec = "0.4"
[dev-dependencies]

7
src/lib.rs
View File

@@ -1063,7 +1063,7 @@ impl CommandEncoder {
impl<'a> RenderPass<'a> {
/// Sets the active bind group for a given bind group index.
pub fn set_bind_group(&mut self, index: u32, bind_group: &BindGroup, offsets: &[u32]) {
pub fn set_bind_group(&mut self, index: u32, bind_group: &BindGroup, offsets: &[BufferAddress]) {
wgn::wgpu_render_pass_set_bind_group(
self.id,
index,
@@ -1096,8 +1096,7 @@ impl<'a> RenderPass<'a> {
///
/// Each element of `buffer_pairs` describes a vertex buffer and an offset in bytes into that
/// buffer. The offset must be aligned to a multiple of 4 bytes.
// TODO: buffer_pairs should be a &[(&Buffer, BufferAddress)]
pub fn set_vertex_buffers(&mut self, buffer_pairs: &[(&Buffer, u32)]) {
pub fn set_vertex_buffers(&mut self, buffer_pairs: &[(&Buffer, BufferAddress)]) {
let mut buffers = Vec::new();
let mut offsets = Vec::new();
for &(buffer, offset) in buffer_pairs {
@@ -1156,7 +1155,7 @@ impl<'a> Drop for RenderPass<'a> {
impl<'a> ComputePass<'a> {
/// Sets the active bind group for a given bind group index.
pub fn set_bind_group(&mut self, index: u32, bind_group: &BindGroup, offsets: &[u32]) {
pub fn set_bind_group(&mut self, index: u32, bind_group: &BindGroup, offsets: &[BufferAddress]) {
wgn::wgpu_compute_pass_set_bind_group(
self.id,
index,