Update library to latest webgpu-native headers #427
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
This goes up to webgpu-native/webgpu-headers@2b59747 Things I *didn't* do: * I didn't update the library to make sure "instance dropped" callback error codes are guaranteed to happen, like they seem to be in Dawn. List of changes (roughly in order of header commits): Various enum and struct renames Updated callbacks to use the new *CallbackInfo structs and 2-userdata system. Also updated functions to return WGPUFuture, though the WGPUFuture thing is just stubbed out at the moment as I don't think wgpu-core has the necessary functionality for it. wgpuInstanceWaitAny is unimplemented!() DepthClipControl merged into PrimitiveState, related code simplified. Updated depthWriteEnabled to use an optional bool, mostly matters due to added validation. Add TODOs for missing features (sliced 3D compressed textures) *Reference() became *AddRef() Added unorm10-10-10-2 vertex format Usage field in TextureViewDescriptor, just used for validation as wgpu-core doesn't allow specifying it anyways. Removed maxInterStageShaderComponents Added clang_macro_fallback to bindgen config, since the headers switched to using UINT32_MAX etc. UINT64_MAX still doesn't work so I had to manually define those. Renamed flags enums. Added a conversion helper function to convert them from u64 -> u32 for mapping. (means added direct dependency on bitflags crate) Removed device argument from (unimplemented) wgpuGetProcAddress Suboptimal surface texture acquisition moved to enum return value, was easy since wgpu-core already returns it like that. "Undefined" present mode added, it just selects FIFO.
PJB3005
force-pushed
the
24-09-19-update-headers
branch
from
1e19d06
to
0c60733
Compare
This enum was replaced with WGPUMapAsyncStatus, but I didn't quite notice. The error codes map different.
|
Remaining Windows CI failure is caused by webgpu-native/webgpu-headers#339 |
Replaces *EnumerateFeatures with *GetFeatures. Also fixes CI due to fix in headers.
almarklein
reviewed
Sep 27, 2024
There was a problem hiding this comment.
LGTM but maybe @rajveermalviya can have a look at the Rust code.
Upstream removed the "Flags" suffix from flags types and moved them to no longer be C enums. This matches that change. WGPUInstanceFlag still has "Flag" in the name because, well, there'd be nothing left to distinguish it from WGPUInstance, and it makes sense for it.
This was referenced Oct 1, 2024
eliemichel
approved these changes
Oct 1, 2024
| let present_mode = match config.presentMode { | ||
| native::WGPUPresentMode_Undefined => wgt::PresentMode::Fifo, | ||
| _ => map_present_mode(config.presentMode), | ||
| }; |
There was a problem hiding this comment.
I believe this match should be part of map_present_mode rather than being added on top of it
There was a problem hiding this comment.
I did this here because I wasn't sure if I could cleanly add that to map_present_mode, as it's defined with a map_enum! macro.
| @@ -1701,3 +1694,11 @@ pub fn map_adapter_type(device_type: wgt::DeviceType) -> native::WGPUAdapterType | |||
| wgt::DeviceType::Cpu => native::WGPUAdapterType_CPU, | |||
| } | |||
| } | |||
|
|
|||
| pub fn from_u64_bits<T: bitflags::Flags<Bits = u32>>(value: u64) -> Option<T> { | |||
There was a problem hiding this comment.
(Note: Ideally bitfields would switch to u64 in upstream wgpu instead of needing a conversion here)
Cargo.toml
Outdated
| @@ -157,6 +157,7 @@ log = "0.4" | |||
| thiserror = "1" | |||
| parking_lot = "0.12" | |||
| smallvec = "1" | |||
| bitflags = "2.6.0" | |||
There was a problem hiding this comment.
It's to be able to refer to bitflags types for the from_u64_bits helper.
Also updates wgpu.h to use WGPUStringView everywhere.
eliemichel
approved these changes
Oct 3, 2024
|
For WGPUFuture, we need to have access to submission index (and return that in the future's id). Here is the beginning of an attempt at adding this upstream: gfx-rs/wgpu#6360 |
PJB3005
commented
Oct 3, 2024
| _ => make_slice(string_view.data as *const u8, string_view.length), | ||
| }; | ||
|
|
||
| Some(std::str::from_utf8_unchecked(bytes)) |
There was a problem hiding this comment.
Important to note: this doesn't check whether strings passed into the library are valid UTF-8. I previously many locations did, but I figured this wasn't necessary.
PJB3005
force-pushed
the
24-09-19-update-headers
branch
from
ef739f1
to
fe965c8
Compare
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.
This goes up to webgpu-native/webgpu-headers@a41b613
Things I didn't do:
List of changes (roughly in order of header commits):
*CallbackInfostructs and 2-userdata system. Also updated functions to returnWGPUFuture, though theWGPUFuturething is just stubbed out at the moment as I don't think wgpu-core has the necessary functionality for it.wgpuInstanceWaitAnyisunimplemented!()DepthClipControlmerged intoPrimitiveState, related code simplified.depthWriteEnabledto use an optional bool, mostly matters due to added validation.*Reference()became*AddRef()unorm10-10-10-2vertex formatTextureViewDescriptor, just used for validation as wgpu-core doesn't allow specifying it anyways.maxInterStageShaderComponentsclang_macro_fallback()to bindgen config, since the headers switched to usingUINT32_MAXetc.UINT64_MAXstill doesn't work so I had to manually define those.wgpuGetProcAddress*EnumerateFeatures()has been replaced with*GetFeatures().WGPUStringView.