Update to wgpu 0.6.0 #52
Conversation
![monocodus[bot]](https://avatars.githubusercontent.com/in/28526?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is an autogenerated code review.
Checker summary (by rust_clippy):
The tool has found 0 warnings, 1 errors.
The .monocodus config not found in your repo. Default config is used.
Check config documentation here
|
Should this be marked as a "draft" until you finish? |
|
oops! meant to do that 😄 |
ncharlton02
force-pushed
the
update-to-0.6.0
branch
3 times, most recently
from
5d0c0f3 to
38b3b83
Compare
|
This is hopefully finished now! Notes:
Testing cbingen bug note: The following pattern causes cbindgen to crash: //In wgt
mod wgt {
pub struct Foo<T> {
foo: T,
}
}
//In wgc
pub type Foo = wgt::Foo<u32>;
//In wgpu-native
mod native {
#[repr(C)]
pub struct Foo{
foo: u32
}
}Basically, cbindgen will panic because it ignores the module name and therefore will have multiple types to export with the same name. This pattern is used by BufferCopyView and TextureCopyView. To work around it, the native versions of the struct are called BufferCopyViewC and TextureCopyViewC, and they are renamed when CBindgen generates the header. A solution would be to move TextureCopyView and BufferCopyView into wgpu-core and remove the type alias. See mozilla/cbindgen#573 for more details |
I think we used the |
cbindgen.toml
Outdated
| @@ -27,7 +28,8 @@ style = "both" | |||
| [export] | |||
| prefix = "WGPU" | |||
| include = [ | |||
| "AnisotropicSamplerDescriptorExt" | |||
| "AnisotropicSamplerDescriptorExt", | |||
| "SamplerBorderColor" | |||
src/command.rs
Outdated
| pub buffer: id::BufferId, | ||
| } | ||
|
|
||
| impl Into<wgc::command::BufferCopyView> for BufferCopyViewC { |
There was a problem hiding this comment.
it would be simpler to just have this as pub fn to_wgpu(&self) -> wgc::command::BufferCopyView. since it would turn xxx.cloned().into() into xxx.to_wgpu(), which is much cleaner
|
|
||
| #[repr(C)] | ||
| #[derive(Clone)] | ||
| pub struct BufferCopyViewC { |
There was a problem hiding this comment.
would it help to slap repr(C) on the relevant wgt structs?
There was a problem hiding this comment.
We can do that for now but we will eventually need to make a separate version here to match the WebGPU headers
There was a problem hiding this comment.
Right, so maybe we should try too hard to re-use it, I agree!
src/lib.rs
Outdated
| fn ref_cow(&self) -> Option<Cow<str>> { | ||
| self.0.as_ref().map(|s| Cow::Borrowed(s.as_str())) | ||
| } | ||
| fn owned_cow<'a>(self) -> Option<Cow<'a, str>> { |
src/lib.rs
Outdated
| @@ -23,8 +26,11 @@ impl OwnedLabel { | |||
| ) | |||
| }) | |||
| } | |||
| fn as_ref(&self) -> Option<&str> { | |||
| self.0.as_ref().map(|s| s.as_str()) | |||
| fn ref_cow(&self) -> Option<Cow<str>> { | |||
ncharlton02
force-pushed
the
update-to-0.6.0
branch
from
38b3b83 to
4bb5df7
Compare
|
Ok all of those recommendations should be fixed! |
Updates to wgpu-core 0.6.0. This is very much a WIP and many things still need to be implemented (textures, push constants), but I thought I would throw this up for comments. Also for error handling, anytime a result is an error, it just panics with a description of the function that panicked.
Testing:
Triangle/Compute Examples
After I finish updating everything I will test it against my own stuff