Merge #677

677: Update to latest wgpu master r=kvark a=yzsolt - Update to latest `wgpu` master - Fix build error caused by gfx-rs/wgpu#1077 Co-authored-by: Zsolt Bölöny <[email protected]>
gfx-rs · Dec 14, 2020 · 26fa5c1 · 26fa5c1
2 parents 2ef7250 + b7ea3f3
commit 26fa5c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,13 +25,13 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"]
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "4846e41eb0ffcaafe148833bc25c3a18abce1b26"
+rev = "01733a2f45143ee43d2a3473bc618fd06cfc076d"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "4846e41eb0ffcaafe148833bc25c3a18abce1b26"
+rev = "01733a2f45143ee43d2a3473bc618fd06cfc076d"
 
 [dependencies]
 arrayvec = "0.5"

diff --git a/src/backend/direct.rs b/src/backend/direct.rs
@@ -225,7 +225,7 @@ mod pass_impl {
             offset: wgt::BufferAddress,
             size: Option<wgt::BufferSize>,
         ) {
-            wgpu_render_pass_set_index_buffer(self, buffer.id, index_format, offset, size)
+            self.set_index_buffer(buffer.id, index_format, offset, size)
         }
         fn set_vertex_buffer(
             &mut self,
@@ -420,7 +420,7 @@ mod pass_impl {
             offset: wgt::BufferAddress,
             size: Option<wgt::BufferSize>,
         ) {
-            wgpu_render_bundle_set_index_buffer(self, buffer.id, index_format, offset, size)
+            self.set_index_buffer(buffer.id, index_format, offset, size)
         }
         fn set_vertex_buffer(
             &mut self,