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

render: Update wgpu to 23 #18431

Merged
merged 1 commit into from
Nov 14, 2024
Merged

render: Update wgpu to 23 #18431

merged 1 commit into from
Nov 14, 2024

Conversation

torokati44
Copy link
Member

@torokati44 torokati44 commented Oct 30, 2024

This lets us drop a whole bunch of (duplicated) dependencies, just look at Cargo.lock!
Currently using egui master.

@torokati44 torokati44 added A-rendering Area: Rendering & Graphics render-wgpu Issues relating to the wgpu renderer T-chore Type: Chore (like updating a dependency, it's gotta be done) labels Oct 30, 2024
@torokati44 torokati44 marked this pull request as draft October 30, 2024 15:20
@Dinnerbone
Copy link
Contributor

I'm hoping to see a little improvement to webgl performance with this!

@torokati44 torokati44 force-pushed the wgpu-23 branch 2 times, most recently from 37b6ab5 to 71bcdc2 Compare October 30, 2024 18:54
@torokati44 torokati44 marked this pull request as ready for review October 30, 2024 18:54
@torokati44 torokati44 force-pushed the wgpu-23 branch 2 times, most recently from c0e1b70 to 75bfc32 Compare October 31, 2024 00:16
@torokati44
Copy link
Member Author

@adrian17 I saw you made some recommendations for this on Discord - unfortunately I am weeks behind reading a lot of the channels there, and don't really want to skip over anything important - so if you could please copy them over here, or even amend the PR if you have the time, I would be grateful!

One suggestion was about not naming the shader stages, right? None at all, or just some?

@Dinnerbone I assume you mean this, right: gfx-rs/wgpu#6427 (Just for future reference...)

Comment on lines -257 to +260
#[allow(unused_mut)]
let mut backend = None;
#[cfg(not(any(target_os = "macos", target_os = "ios")))]
{
backend = backend.or(report.vulkan).or(report.gl);
}
#[cfg(windows)]
{
backend = backend.or(report.dx12);
}
#[cfg(any(target_os = "macos", target_os = "ios"))]
{
backend = backend.or(report.metal);
}

if let Some(stats) = backend {
tracy.plot(BIND_GROUPS, stats.bind_groups.num_allocated as f64);
tracy.plot(BUFFERS, stats.buffers.num_allocated as f64);
tracy.plot(TEXTURES, stats.textures.num_allocated as f64);
tracy.plot(TEXTURE_VIEWS, stats.texture_views.num_allocated as f64);
}
tracy.plot(BIND_GROUPS, report.hub.bind_groups.num_allocated as f64);
tracy.plot(BUFFERS, report.hub.buffers.num_allocated as f64);
tracy.plot(TEXTURES, report.hub.textures.num_allocated as f64);
tracy.plot(TEXTURE_VIEWS, report.hub.texture_views.num_allocated as f64);
Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Bah, GH linking...
Basically:
image

@Dinnerbone Dinnerbone enabled auto-merge (rebase) November 14, 2024 16:30
@Dinnerbone Dinnerbone merged commit af14dea into ruffle-rs:master Nov 14, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rendering Area: Rendering & Graphics render-wgpu Issues relating to the wgpu renderer T-chore Type: Chore (like updating a dependency, it's gotta be done)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants