Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to wgpu 24.0.0 #791

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Conversation

songhuaixu
Copy link

No description provided.

@waywardmonkeys
Copy link
Collaborator

@songhuaixu Thank you for this contribution!

This leads us to an interesting issue which is that we haven't yet released a version that is compatible with Bevy, so we're going to need to hold on this at least until that happens:

https://xi.zulipchat.com/#narrow/channel/197075-gpu/topic/wgpu.20v24.20released

Is there a particular part of this update that you're in need of to have it sooner rather than a bit later?

@songhuaixu
Copy link
Author

@songhuaixu Thank you for this contribution!

This leads us to an interesting issue which is that we haven't yet released a version that is compatible with Bevy, so we're going to need to hold on this at least until that happens:

https://xi.zulipchat.com/#narrow/channel/197075-gpu/topic/wgpu.20v24.20released

Is there a particular part of this update that you're in need of to have it sooner rather than a bit later?

I can wait for Bevy

Copy link
Member

@DJMcNab DJMcNab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! A few things.

@@ -74,7 +74,7 @@ wasm-bindgen-futures = "0.4.45"
web-sys = { version = "0.3.72", features = ["HtmlCollection", "Text"] }
web-time = { workspace = true }
# If updating, also update in .github/workflows/web-demo.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I'd expect this to apply to this update?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I have already applied the update. The changes have been made and it should now work as expected.

@@ -119,5 +119,6 @@ clap = "4.5.21"
anyhow = "1.0.93"
pollster = "0.4.0"
web-time = "1.1.0"
wgpu-profiler = "0.19.0"
#wgpu-profiler = "0.19.0"
wgpu-profiler = { git = "https://github.com/songhuaixu/wgpu-profiler.git", branch = "update-wgpu" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot merge this PR until wgpu-profiler makes a corresponding release, of course. I'd suggest marking this PR as draft to indicate that.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your reminder. I have already submitted the PR for wgpu-profiler. I will keep an eye on its progress and once the corresponding release is made, I will update this PR accordingly. In the meantime, I agree that marking this PR as draft is a good way to indicate that it's not ready to be merged yet. I will do that now.

dx12_shader_compiler,
gles_minor_version,
backend_options: wgpu::BackendOptions {
dx12: wgpu::Dx12BackendOptions {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this is equivalent to BackendOptions::from_env_or_default

Copy link
Author

@songhuaixu songhuaixu Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. I have already made the changes, and now it is equivalent to BackendOptions::from_env_or_default

@@ -42,6 +42,7 @@ pub fn translate(shader: &ShaderInfo) -> Result<String, naga_msl::Error> {
fake_missing_bindings: false,
bounds_check_policies: naga::proc::BoundsCheckPolicies::default(),
zero_initialize_workgroup_memory: true,
force_loop_bounding: true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we will eventually want this to be false (cc @b0nes164, for #685)

However, we should make that a follow-up, as we'd also need to use create_shader_module_trusted at the same time.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you. With force_loop_bounding: true, in the current version, it should be fine as it is.

@songhuaixu songhuaixu marked this pull request as draft January 16, 2025 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants