Use callback for request_adapter
#375
Merged
Conversation
This file contains hidden or 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
grovesNL
commented
Nov 7, 2019
| @@ -301,11 +302,16 @@ pub extern "C" fn wgpu_create_surface_from_windows_hwnd( | |||
| )) | |||
| } | |||
|
|
|||
| pub fn request_adapter( | |||
| pub type RequestAdapterCallback = | |||
| extern "C" fn(adapter: *const AdapterId, userdata: *mut c_void); | |||
There was a problem hiding this comment.
I noticed we use *mut u8 for userdata in buffer mapping, but maybe we should consider using *mut c_void like we do here. For example, we expect userdata to generally be a user-provided type anyway (not necessarily a byte array), so is there any benefit from requiring *mut u8?
There was a problem hiding this comment.
yes, I agree, *mut void seems more appropriate. We might need to file a PR to upstream webgpu header
kvark
approved these changes
Nov 7, 2019
kvark
requested changes
Nov 7, 2019
kvark
approved these changes
Nov 8, 2019
|
Thank you for addressing my concerns! |
bors bot
added a commit
that referenced
this pull request
Nov 8, 2019
375: Use callback for `request_adapter` r=kvark a=grovesNL For now this is mostly a signature change which allows us to start using a callback for `request_adapter`. Once we have an event loop, the callback could be scheduled to make this asynchronous. At that point the examples and server would have to be updated, because they currently rely on the callback running immediately (inline). The reason for this change is that `request_adapter` is supposed to return a `Promise` in JS, so we can represent it with callbacks at the C API, and `Future` in Rust (though we'll probably keep using callbacks initially). I also changed `request_adapter` to provide an adapter with `AdapterId::ERROR` when no adapters are available, so we can add basic error handling to wgpu-rs (gfx-rs/wgpu-rs#117). Co-authored-by: Joshua Groves <[email protected]>
Build succeeded |
kvark
pushed a commit
to kvark/wgpu
that referenced
this pull request
Jun 3, 2021
375: Add water example. r=kvark,cwfitzgerald a=OptimisticPeach Solves gfx-rs#329, water example requested by @kvark. I tuned it to my personal preference of visuals, however it might be different for you. Note: I used https://github.com/ashima/webgl-noise for 3D open simplex noise. I've commented to explain what most of the things in the rust side of the example mean. However, I'm not 100% sure I did the best job at giving a brief overview, and wouldn't mind someone making sure my terminology/definitions are correct. Thanks! Patrik Co-authored-by: OptimisticPeach <[email protected]>
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.
For now this is mostly a signature change which allows us to start using a callback for
request_adapter. Once we have an event loop, the callback could be scheduled to make this asynchronous. At that point the examples and server would have to be updated, because they currently rely on the callback running immediately (inline).The reason for this change is that
request_adapteris supposed to return aPromisein JS, so we can represent it with callbacks at the C API, andFuturein Rust (though we'll probably keep using callbacks initially).I also changed
request_adapterto provide an adapter withAdapterId::ERRORwhen no adapters are available, so we can add basic error handling to wgpu-rs (gfx-rs/wgpu-rs#117).