Skip to content

desktop,render: Update egui to 0.34.3 and wgpu/naga to 29.0.4 - #24229

Draft
torokati44 wants to merge 14 commits into
ruffle-rs:masterfrom
torokati44:wgpu-29
Draft

desktop,render: Update egui to 0.34.3 and wgpu/naga to 29.0.4#24229
torokati44 wants to merge 14 commits into
ruffle-rs:masterfrom
torokati44:wgpu-29

Conversation

@torokati44

@torokati44 torokati44 commented Jul 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Description

Continuation of #23274, fixes the regression of mouse clicks not reaching the movie, via emilk/egui#8081 backported into emilk/egui#8145 (ref: emilk/egui#8041).

Testing

CI, plus, for example: cargo run -- 'https://ruffle.rs/demo/swfs/marvin_spectrum.swf'

Checklist

  • I, a human, have self-reviewed this PR and fully understand the changes within.
  • I have made or updated tests where possible.
  • All of my commits are properly scoped, compile successfully, and pass all tests.
  • This PR does not make sense to split up into smaller PRs.
  • An LLM was involved in the authoring of this code.

@torokati44 torokati44 added A-deps Area: Dependencies T-chore Type: Chore (like updating a dependency, it's gotta be done) labels Jul 16, 2026
@torokati44

torokati44 commented Jul 16, 2026

Copy link
Copy Markdown
Member Author

Oh heck: gfx-rs/wgpu#9476
Do we have to jump straight to egui 0.35 and wgpu 30? 😵‍💫

@torokati44 torokati44 mentioned this pull request Jul 16, 2026
Merged
@torokati44

torokati44 commented Jul 16, 2026

Copy link
Copy Markdown
Member Author

I've split this into several small logical commits to (maybe) make review easier, but obviously this all should be squashed into one large commit upon merge, as the intermediate states don't make sense.

@danielhjacobs danielhjacobs added the squash-on-merge Marks a PR to be squashed before merging. label Jul 16, 2026
@torokati44

torokati44 commented Jul 16, 2026

Copy link
Copy Markdown
Member Author

Oh, the hack for fixing web worked!

kjarosh
kjarosh reviewed Jul 16, 2026
View reviewed changes
Comment thread desktop/src/gui/controller.rs
state @ (wgpu::CurrentSurfaceTexture::Timeout
| wgpu::CurrentSurfaceTexture::Occluded) => {
// Acquiring the frame took too long, or the window is occluded
// (e.g. minimized or fully covered by another window).

@kjarosh kjarosh Jul 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we want to spam warnings in this case? How does it work?

@torokati44 torokati44 Jul 27, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fair point, not really... I don't know off the top of my head which window managers do this "not minimized but not presenting either" state, probably one of the tiling ones...?

@danielhjacobs danielhjacobs mentioned this pull request Jul 16, 2026
Merged
kjarosh pushed a commit that referenced this pull request Jul 17, 2026
@danielhjacobs
Revert "chore: Bump wgpu to 28, switch egui to git" (#24234)
5a6ed4f 
This reverts commit e8e311d.

It appears the egui bump caused buttons in games (such as SM63, as mentioned on Discord)
to fail to work on the Desktop app. This is a temporary revert before a proper fix in #24229.
@danielhjacobs danielhjacobs mentioned this pull request Jul 22, 2026
Closed
torokati44 added 14 commits July 22, 2026 22:17
@torokati44
chore: Bump wgpu to 28, switch egui to git
c337f16
@torokati44
cargo stuff
6dea35c
@torokati44
create_pipeline_layout bind_group_layouts API change
b723122
@torokati44
depth_write_enabled depth_compare API change
2c3013d
@torokati44
memory_decorations API change
1e1b604
@torokati44
incoming_ray_payload API change
e0848c1
@torokati44
max_inter_stage_shader_components max_inter_stage_shader_variables AP…
56424b4 
…I change
@torokati44
max_uniform_buffer_binding_size unnecessary cast
ef9ebc4
@torokati44
set strip_index_format in PrimitiveState
e70be68
@torokati44
WriteOnly API change
f4a5399
@torokati44
pass in optional display to create_wgpu_instance for InstanceDescriptor
8000301
@torokati44
pass in optional window to find_available_graphics_backends, select_w…
1e227e1 
…gpu_backend, try_wgpu_backend, for create_wgpu_instance
@torokati44
don't return removed SurfaceError from get_next_texture
4f193d3
@torokati44
attempt at fixing web tests
539a47a
@torokati44

torokati44 commented Jul 22, 2026

Copy link
Copy Markdown
Member Author

This now includes #23274 (which got reverted in #24234) as an intermediate first step.

@torokati44 torokati44 mentioned this pull request Jul 27, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kjarosh kjarosh kjarosh left review comments

At least 0 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

A-deps Area: Dependencies squash-on-merge Marks a PR to be squashed before merging. T-chore Type: Chore (like updating a dependency, it's gotta be done)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@torokati44 @kjarosh @danielhjacobs