Bug 1868143 - Update wgpu to revision 767ac03245ee937d3dc552edc13fe…

…7ab0a860eec. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler # Changelog * #4708 Fix max_vertex_buffers validation By nical in gfx-rs/wgpu#4708 * #4729 Remove expected failure on AMD/DX12 from msaa example By teoxoy in gfx-rs/wgpu#4729 * #4711 [naga] Add `Literal::I64`, for signed 64-bit integer literals. By jimblandy in gfx-rs/wgpu#4711 * #4736 Bump serde from 1.0.192 to 1.0.193 By dependabot[bot] in gfx-rs/wgpu#4736 * #4735 [naga]: Let `TypeInner::Matrix` hold a `Scalar`, not just a width. By jimblandy in gfx-rs/wgpu#4735 * #4741 [naga] Fix type error in test. By jimblandy in gfx-rs/wgpu#4741 * #4742 [naga]: Make snapshot tests include paths in errors. By jimblandy in gfx-rs/wgpu#4742 * #4723 Test And Normalize Vertex Behavior on All Backends By cwfitzgerald in gfx-rs/wgpu#4723 * #4746 Skip Flaky Test By cwfitzgerald in gfx-rs/wgpu#4746 * #4744 Ensure DeviceLostClosureC callbacks have null-terminated message strings By bradwerth in gfx-rs/wgpu#4744 * #4745 [naga wgsl-in] Test hex float suffix handling corner case. By jimblandy in gfx-rs/wgpu#4745 * #4737 Make the command_encoder_clear_buffer's size an Option<BufferAddress> By nical in gfx-rs/wgpu#4737 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4733 [naga wgsl-in] Preserve type names in `alias` declarations. By jimblandy in gfx-rs/wgpu#4733 * #4734 [naga] Make compaction preserve named types, even if unused. By jimblandy in gfx-rs/wgpu#4734 * #4752 Logging cleanups in device/global.rs By nical in gfx-rs/wgpu#4752 * #4753 Fix Mac Event Loop By cwfitzgerald in gfx-rs/wgpu#4753 * #4754 wgpu-hal(vk): Add WGPU_ALLOW_NONCOMPLIANT_ADAPTER By i509VCB in gfx-rs/wgpu#4754 * #4748 Allow Tests to Expect Certain Panic or Validation Messages By cwfitzgerald in gfx-rs/wgpu#4748 * #4756 Move to A Single Example Executable By cwfitzgerald in gfx-rs/wgpu#4756 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4761 [naga] Make the `example_wgsl` test build without `wgsl-in` feature. By jimblandy in gfx-rs/wgpu#4761 * #4769 Conditionally lift API logging from trace to info level By nical in gfx-rs/wgpu#4769 * #4771 Downgrade some of wgpu_core's logging level from info to trace and debug By nical in gfx-rs/wgpu#4771 * #4760 Rename `ALLOW_NONCOMPLIANT_ADAPTER` to `ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER` By teoxoy in gfx-rs/wgpu#4760 * #4772 Downgrade resource lifetime management log level to trace. By nical in gfx-rs/wgpu#4772 * #4765 Revamp Examples to Match Website By cwfitzgerald in gfx-rs/wgpu#4765 * #4774 Update examples readme files By roffs in gfx-rs/wgpu#4774 * #4781 remove_abandoned fix By gents83 in gfx-rs/wgpu#4781 * #4777 Bump web-sys to 0.3.65 By torokati44 in gfx-rs/wgpu#4777 * #4780 Fixes for Skybox and All Examples By cwfitzgerald in gfx-rs/wgpu#4780 * #4782 Remove resources ONLY when needed inside wgpu and not in user land By gents83 in gfx-rs/wgpu#4782 * #4786 Don't keep a strong ref in storage for destroyed resources By gents83 in gfx-rs/wgpu#4786 * #4795 Fix Arcanization changelog By a1phyr in gfx-rs/wgpu#4795 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4573 Support nv12 texture format By xiaopengli89 in gfx-rs/wgpu#4573 * #4789 Bump js-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4789 * #4784 Bump winit from 0.29.3 to 0.29.4 By dependabot[bot] in gfx-rs/wgpu#4784 * #4798 Bump JamesIves/github-pages-deploy-action from 4.4.3 to 4.5.0 By dependabot[bot] in gfx-rs/wgpu#4798 * #4800 Bump web-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4800 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4799 Bump wasm-bindgen-futures from 0.4.38 to 0.4.39 By dependabot[bot] in gfx-rs/wgpu#4799 * #4796 Remove surface extent validation (and thus fix the annoying `Requested size ... is outside of the supported range` warning) By Wumpf in gfx-rs/wgpu#4796 * #4804 Add space to a comment inside make_spirv_raw By ComfyFluffy in gfx-rs/wgpu#4804 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4805 [naga] Improve ConstantEvaluatorError::InvalidCastArg message. By jimblandy in gfx-rs/wgpu#4805 * #4801 update deno By crowlKats in gfx-rs/wgpu#4801 * #4806 Fixes and changes to the documentation for increasing clarity By Blatko1 in gfx-rs/wgpu#4806 * #4809 [naga wgsl-in] Use a better span for errors in constructors. By jimblandy in gfx-rs/wgpu#4809 * #4808 [naga wgsl-in] Drop spanless labels from front-end error messages. By jimblandy in gfx-rs/wgpu#4808 * #4822 Fix expected error message By teoxoy in gfx-rs/wgpu#4822 * #4759 Add feature float32-filterable By almarklein in gfx-rs/wgpu#4759 * #4813 Bump core-graphics-types from 0.1.2 to 0.1.3 By dependabot[bot] in gfx-rs/wgpu#4813 Differential Revision: https://phabricator.services.mozilla.com/D195438 UltraBlame original commit: 985aabb5bf419ffcc9248010353ff190c225ba61
marco-c · Dec 7, 2023 · 718ed41 · 718ed41
1 parent 1ef8a9b
commit 718ed41
Show file tree

Hide file tree

Showing 99 changed files with 2,462 additions and 992 deletions.
diff --git a/.cargo/config.in b/.cargo/config.in
@@ -25,9 +25,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=767ac03245ee937d3dc552edc13fe7ab0a860eec"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dom/webgpu/Adapter.cpp b/dom/webgpu/Adapter.cpp
@@ -130,10 +130,7 @@ static Maybe<ffi::WGPUFeatures> ToWGPUFeatures(
       return Some(WGPUFeatures_BGRA8UNORM_STORAGE);
 
     case dom::GPUFeatureName::Float32_filterable:
-#ifdef WGPUFeatures_FLOAT32_FILTERABLE
-#  error fix todo
-#endif
-      return Nothing();  
+      return Some(WGPUFeatures_FLOAT32_FILTERABLE);
 
     case dom::GPUFeatureName::EndGuard_:
       break;
@@ -454,15 +451,16 @@ already_AddRefed<dom::Promise> Adapter::RequestDevice(
 
 
     ffi::WGPUDeviceDescriptor ffiDesc = {};
-    ffiDesc.features = *MakeFeatureBits(aDesc.mRequiredFeatures);
-    ffiDesc.limits = deviceLimits;
+    ffiDesc.required_features = *MakeFeatureBits(aDesc.mRequiredFeatures);
+    ffiDesc.required_limits = deviceLimits;
     auto request = mBridge->AdapterRequestDevice(mId, ffiDesc);
     if (!request) {
       promise->MaybeRejectWithNotSupportedError(
           "Unable to instantiate a Device");
       return;
     }
-    RefPtr<Device> device = new Device(this, request->mId, ffiDesc.limits);
+    RefPtr<Device> device =
+        new Device(this, request->mId, ffiDesc.required_limits);
     for (const auto& feature : aDesc.mRequiredFeatures) {
       device->mFeatures->Add(feature, aRv);
     }

diff --git a/gfx/wgpu_bindings/Cargo.toml b/gfx/wgpu_bindings/Cargo.toml
@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 #Note: "replay" shouldn't ideally be needed,
 # but it allows us to serialize everything across IPC.
 features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
@@ -27,36 +27,36 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 features = ["metal"]
 
 # We want the wgpu-core Direct3D backends on Windows.
 [target.'cfg(windows)'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 features = ["dx11", "dx12"]
 
 # We want the wgpu-core Vulkan backend on Linux and Windows.
 [target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 
 [target.'cfg(windows)'.dependencies.d3d12]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
+rev = "767ac03245ee937d3dc552edc13fe7ab0a860eec"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"

diff --git a/gfx/wgpu_bindings/moz.yaml b/gfx/wgpu_bindings/moz.yaml
@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit a820a3ffba468cbb87c2a7e7bbe37065ed5207ee
+  release: commit 767ac03245ee937d3dc552edc13fe7ab0a860eec
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: a820a3ffba468cbb87c2a7e7bbe37065ed5207ee
+  revision: 767ac03245ee937d3dc552edc13fe7ab0a860eec
 
   license: ['MIT', 'Apache-2.0']
 

diff --git a/gfx/wgpu_bindings/src/client.rs b/gfx/wgpu_bindings/src/client.rs
@@ -580,6 +580,7 @@ pub extern "C" fn wgpu_client_create_texture_view(
             base_array_layer: desc.base_array_layer,
             array_layer_count: desc.array_layer_count.map(|ptr| *ptr),
         },
+        plane: None,
     };
 
     let action = TextureAction::CreateView(id, wgpu_desc);

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -1201,6 +1201,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.7.0@git:6e21f7a9291db4395192d6b510d906978ae2d251 -> 0.7.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
 
+[[audits.d3d12]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.7.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee -> 0.7.0@git:767ac03245ee937d3dc552edc13fe7ab0a860eec"
+
 [[audits.d3d12]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -2492,6 +2497,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.14.0@git:6e21f7a9291db4395192d6b510d906978ae2d251 -> 0.14.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
 
+[[audits.naga]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.14.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee -> 0.14.0@git:767ac03245ee937d3dc552edc13fe7ab0a860eec"
+
 [[audits.naga]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4255,6 +4265,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251 -> 0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
 
+[[audits.wgpu-core]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee -> 0.18.0@git:767ac03245ee937d3dc552edc13fe7ab0a860eec"
+
 [[audits.wgpu-core]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4323,6 +4338,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251 -> 0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
 
+[[audits.wgpu-hal]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee -> 0.18.0@git:767ac03245ee937d3dc552edc13fe7ab0a860eec"
+
 [[audits.wgpu-hal]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4391,6 +4411,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251 -> 0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee"
 
+[[audits.wgpu-types]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:a820a3ffba468cbb87c2a7e7bbe37065ed5207ee -> 0.18.0@git:767ac03245ee937d3dc552edc13fe7ab0a860eec"
+
 [[audits.wgpu-types]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"

diff --git a/third_party/rust/d3d12/.cargo-checksum.json b/third_party/rust/d3d12/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"45fa76b0e5bc51721887147000e9e78a5934cb04d1ad628e501ef2082763d353","Cargo.toml":"1b0564721518684589ff305dd77017193ef116cd29c19eb6d92c81a9f9962a4c","README.md":"76cee3209f773a62535de6c9724b53f158406359f35b4d48b17ac3747b6c102e","src/com.rs":"cfc8f5692162b4cbf9bf370959ad0be08a40a7e9026b5511ca0065ffe33f72ab","src/command_allocator.rs":"ef01059a661749470f3772d188fe0fab0f002e1d154facdab4b9b2932f4b2d93","src/command_list.rs":"beb49cf5a4e53e3e5b121ea7c3247fc8e74eaba67f1fb7dee3416174d5a9fa07","src/debug.rs":"67c8eb966cf349038f79c691e42b5d86cd8fc63c40d10cc279172400d56db6dc","src/descriptor.rs":"fea0b820de1566b54d17d8d0c67e6f5a2126eda19526397eb710ff7d6db9db9e","src/device.rs":"c1dd479aabd22bced0d407523d60629ad1da439fb47ad89fe7b48bae1c4b23e5","src/dxgi.rs":"1516186845b91bf3df813a29b4a0e00a85ca5649fb7a2755da43fba984c41a42","src/heap.rs":"dae2380684896c97e97ed022929f79ce2cc4f5418a3ec34883086f7c88f423d0","src/lib.rs":"612e2f471b84502d219da3fb86ee13f3cbd6faf17d77407bab6c84e51ec424d0","src/pso.rs":"ff819c321536695e34a3be9a6051cf3e57765049a4a2035db6ab27add5a7978a","src/query.rs":"ff61a2b76a108afc1f082724bb9b07ac8b52afbe97356e0fcf6df0ff7e53e07d","src/queue.rs":"bd32813d0b8a3bedf3223b69ade9f9c799a138a9e27d970f86435d9ce32d1557","src/resource.rs":"8989cdb7c3ee0687c826047f39f85148459d9219754f20a970bf8aaa09b96e27","src/sync.rs":"5c287fb7498242a397eb1f08887be9cff9b48dc7cb13af5792cce5f7182b55f8"},"package":null}
+{"files":{"CHANGELOG.md":"45fa76b0e5bc51721887147000e9e78a5934cb04d1ad628e501ef2082763d353","Cargo.toml":"1b0564721518684589ff305dd77017193ef116cd29c19eb6d92c81a9f9962a4c","README.md":"76cee3209f773a62535de6c9724b53f158406359f35b4d48b17ac3747b6c102e","src/com.rs":"cfc8f5692162b4cbf9bf370959ad0be08a40a7e9026b5511ca0065ffe33f72ab","src/command_allocator.rs":"ef01059a661749470f3772d188fe0fab0f002e1d154facdab4b9b2932f4b2d93","src/command_list.rs":"8723f3b755b721e0dbb234bd604956c1b7922a2368231197495daa3fa6548e63","src/debug.rs":"67c8eb966cf349038f79c691e42b5d86cd8fc63c40d10cc279172400d56db6dc","src/descriptor.rs":"fea0b820de1566b54d17d8d0c67e6f5a2126eda19526397eb710ff7d6db9db9e","src/device.rs":"c1dd479aabd22bced0d407523d60629ad1da439fb47ad89fe7b48bae1c4b23e5","src/dxgi.rs":"1516186845b91bf3df813a29b4a0e00a85ca5649fb7a2755da43fba984c41a42","src/heap.rs":"dae2380684896c97e97ed022929f79ce2cc4f5418a3ec34883086f7c88f423d0","src/lib.rs":"612e2f471b84502d219da3fb86ee13f3cbd6faf17d77407bab6c84e51ec424d0","src/pso.rs":"ff819c321536695e34a3be9a6051cf3e57765049a4a2035db6ab27add5a7978a","src/query.rs":"ff61a2b76a108afc1f082724bb9b07ac8b52afbe97356e0fcf6df0ff7e53e07d","src/queue.rs":"bd32813d0b8a3bedf3223b69ade9f9c799a138a9e27d970f86435d9ce32d1557","src/resource.rs":"8989cdb7c3ee0687c826047f39f85148459d9219754f20a970bf8aaa09b96e27","src/sync.rs":"5c287fb7498242a397eb1f08887be9cff9b48dc7cb13af5792cce5f7182b55f8"},"package":null}
diff --git a/third_party/rust/d3d12/src/command_list.rs b/third_party/rust/d3d12/src/command_list.rs
@@ -213,29 +213,29 @@ impl GraphicsCommandList {
         &self,
         num_vertices: VertexCount,
         num_instances: InstanceCount,
-        start_vertex: VertexCount,
-        start_instance: InstanceCount,
+        first_vertex: VertexCount,
+        first_instance: InstanceCount,
     ) {
         unsafe {
-            self.DrawInstanced(num_vertices, num_instances, start_vertex, start_instance);
+            self.DrawInstanced(num_vertices, num_instances, first_vertex, first_instance);
         }
     }
 
     pub fn draw_indexed(
         &self,
         num_indices: IndexCount,
         num_instances: InstanceCount,
-        start_index: IndexCount,
+        first_index: IndexCount,
         base_vertex: VertexOffset,
-        start_instance: InstanceCount,
+        first_instance: InstanceCount,
     ) {
         unsafe {
             self.DrawIndexedInstanced(
                 num_indices,
                 num_instances,
-                start_index,
+                first_index,
                 base_vertex,
-                start_instance,
+                first_instance,
             );
         }
     }