Skip to content

Update to wgpu 0.18, naga 0.14, naga_oil 0.11, egui 0.24.1#13732

Merged
torokati44 merged 1 commit intoruffle-rs:masterfrom
torokati44:wgpu-0.18
Dec 14, 2023
Merged

Update to wgpu 0.18, naga 0.14, naga_oil 0.11, egui 0.24.1#13732
torokati44 merged 1 commit intoruffle-rs:masterfrom
torokati44:wgpu-0.18

Conversation

@torokati44
Copy link
Copy Markdown
Member

@torokati44 torokati44 commented Oct 26, 2023 •
edited
Loading

Currently blocked by, and mostly based on: emilk/egui#3505
EDIT: This is now merged, waiting for a new release.
EDIT: egui 0.24 is now out.

Also blocked by bevyengine/naga_oil#63, which is in turn, by gfx-rs/wgpu#4569.
EDIT: The latter is now merged, also waiting for a new release.
EDIT: A backport of the latter is in v0.18: gfx-rs/wgpu#4693
EDIT: naga_oil 0.11.0 and wgpu-core 0.18.1 are now out with these fixes.

Feel free to force-push this branch if any of you continue working on this!

This was referenced Oct 30, 2023
Closed
Closed
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 2 times, most recently from 4aeeb47 to ca9c083 Compare November 11, 2023 21:31
@torokati44 torokati44 mentioned this pull request Nov 13, 2023
Closed
1 task
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 4 times, most recently from 16a36d5 to 1b43c9f Compare November 17, 2023 22:04
@torokati44 torokati44 mentioned this pull request Nov 20, 2023
Closed
1 task
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 3 times, most recently from 33aa3b2 to fed1749 Compare November 22, 2023 21:41
@torokati44
Copy link
Copy Markdown
Member Author

torokati44 commented Nov 23, 2023 •
edited
Loading

Some remaining issues:

  • The Windows CI runner sometimes gets stuck and the job is terminated after a few hours. I don't know which test causes this.
  • The close button (X) of the desktop player window doesn't work - probably sends a different event now, which we are not handling yet.
  • I'm not entirely sure about all those added ..Default::default()s. I think they are fine, but also maybe some fields are still also explicitly set to their defaults, which could be cleaned up.
  • EDIT: And the downgrade of web-sys and js-sys from 0.3.65 to 0.3.64 because of some feature changes.

@torokati44 torokati44 marked this pull request as ready for review November 23, 2023 18:14
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 3 times, most recently from b910df0 to 1a83140 Compare November 23, 2023 19:44
@torokati44 torokati44 changed the title Update to wgpu 0.18 Update to wgpu 0.18, naga 0.14, naga_oil 0.11, egui 0.24 Nov 24, 2023
@Aaron1011
Copy link
Copy Markdown
Member

Aaron1011 commented Nov 24, 2023

The close button issue will be fixed by emilk/egui#3627 (though we can easily work around it on our end if we want)

This was referenced Nov 26, 2023
Closed
Closed
Closed
Closed
@torokati44
Copy link
Copy Markdown
Member Author

torokati44 commented Nov 28, 2023

Marking as draft for a short time again, see the comments under gfx-rs/wgpu#4778.

@torokati44 torokati44 marked this pull request as draft November 28, 2023 09:45
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 2 times, most recently from e09c870 to 1c724fa Compare November 30, 2023 22:41
@torokati44 torokati44 changed the title Update to wgpu 0.18, naga 0.14, naga_oil 0.11, egui 0.24 Update to wgpu 0.18, naga 0.14, naga_oil 0.11, egui 0.24.1 Nov 30, 2023
@torokati44
Copy link
Copy Markdown
Member Author

torokati44 commented Nov 30, 2023 •
edited
Loading

I haven't seen the Windows CI runner failure for a while now.

  • EDIT: Shoot, its suckiness is back. At least it got caught in the act!

The close button (X) is fixed.
I'll leave the judgement of the ..Default::default()s to the reviewers. It's at least not worse than it was.
The web-sys situation is resolved.

@torokati44 torokati44 marked this pull request as ready for review November 30, 2023 22:46
@torokati44 torokati44 mentioned this pull request Dec 1, 2023
Open
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 2 times, most recently from e68962a to 7dc84a4 Compare December 3, 2023 23:53
This was referenced Dec 4, 2023
Merged
Closed
This was referenced Dec 11, 2023
Closed
Merged
@torokati44 torokati44 force-pushed the wgpu-0.18 branch 2 times, most recently from edf1828 to bca3a92 Compare December 13, 2023 21:06
@torokati44 torokati44 mentioned this pull request Dec 13, 2023
Closed
@torokati44 torokati44 enabled auto-merge (rebase) December 14, 2023 00:22
@torokati44 torokati44 merged commit bf9cf92 into ruffle-rs:master Dec 14, 2023
@HaimZik HaimZik mentioned this pull request Dec 16, 2023
Closed
@torokati44 torokati44 mentioned this pull request Dec 16, 2023
Closed
This was referenced Dec 19, 2023
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@torokati44 @Aaron1011