Remove extern "C" from set_index_buffer #1077
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![monocodus[bot]](https://avatars.githubusercontent.com/in/28526?s=60&v=4){kind=small}
kvark
reviewed
Dec 6, 2020
wgpu-core/src/command/bundle.rs
Outdated
| @@ -1076,8 +1076,7 @@ pub mod bundle_ffi { | |||
| .push(RenderCommand::SetPipeline(pipeline_id)); | |||
| } | |||
|
|
|||
| #[no_mangle] | |||
| pub extern "C" fn wgpu_render_bundle_set_index_buffer( | |||
| pub fn wgpu_render_bundle_set_index_buffer( | |||
There was a problem hiding this comment.
We should probably just make it a method on RenderBundleEncoder then. No need for a standalone function, it's just confusing the reader.
bors bot
added a commit
to gfx-rs/wgpu-native
that referenced
this pull request
Dec 13, 2020
61: Update to latest wgpu-core r=kvark a=DevOrc Updates wgpu-core to [69196d8](gfx-rs/wgpu@69196d8) Notes: - Currently blocked by wgpu-core (see gfx-rs/wgpu#1077) - Updates the error handling as a result of (gfx-rs/wgpu#1034) - set_index_buffer requires an IndexFormat Co-authored-by: Noah Charlton <ncharlton002@gmail.com>
bors bot
added a commit
to gfx-rs/wgpu-rs
that referenced
this pull request
Dec 14, 2020
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 <bolony.zsolt@gmail.com>
kvark
pushed a commit
to kvark/wgpu
that referenced
this pull request
Jun 3, 2021
677: Update to latest wgpu master r=kvark a=yzsolt - Update to latest `wgpu` master - Fix build error caused by gfx-rs#1077 Co-authored-by: Zsolt Bölöny <bolony.zsolt@gmail.com>
jimblandy
added a commit
to jimblandy/wgpu
that referenced
this pull request
May 15, 2022
It's very odd to have almost all the render pass and compute pass ffi functions in `wgpu` except for the `set_index_buffer` functions, which live in Firefox. I'd like to remove these from Firefox and put them back next to their companions. These functions were originally removed from wgpu in gfx-rs#1077, because wgpu-native has its own incompatible version of IndexFormat (see that PR for details). However, with wgpu-native#85, that code was removed, so having these functions in `wgpu` should be no longer be a problem for wgpu-native.
cwfitzgerald
pushed a commit
that referenced
this pull request
May 15, 2022
It's very odd to have almost all the render pass and compute pass ffi functions in `wgpu` except for the `set_index_buffer` functions, which live in Firefox. I'd like to remove these from Firefox and put them back next to their companions. These functions were originally removed from wgpu in #1077, because wgpu-native has its own incompatible version of IndexFormat (see that PR for details). However, with wgpu-native#85, that code was removed, so having these functions in `wgpu` should be no longer be a problem for wgpu-native.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Fixes an issue that is blocking gfx-rs/wgpu-native#61
Description
Moves the ffi definition of wgpu_render_bundle_set_index_buffer / wgpu_render_pass_set_index_buffer to wgpu-native. This is needed because wgpu-native has its own version of IndexFormat that is different than the wgpu_types version.
Testing
My projects with wgpu-native work