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 latest wgpu and egui/eframe #7218

Merged
merged 29 commits into from
Sep 2, 2024
Merged

Update to latest wgpu and egui/eframe #7218

merged 29 commits into from
Sep 2, 2024

Conversation

emilk
Copy link
Member

@emilk emilk commented Aug 16, 2024

What

This changes the interface between HTML/JS and WASM from passing a canvas id, to passing the canvas element directly (emilk/egui#4780). This means the preview of this PR is broken, and merging this PR will likely break it for all subsequent PRs. @jprochazk do you have a good idea how we can fix this?

TODO

  • The re_renderer example needs a winit update
  • Fix uses of deprecated functions.

Checklist

  • I have read and agree to Contributor Guide and the Code of Conduct
  • I've included a screenshot or gif (if applicable)
  • I have tested pixi run rerun-web
  • I have tested the web demo (if applicable):
  • The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG
  • If applicable, add a new check to the release checklist!
  • If have noted any breaking changes to the log API in CHANGELOG.md and the migration guide

To run all checks from main, comment on the PR with @rerun-bot full-check.

@emilk emilk added 🔺 re_renderer affects re_renderer itself dependencies concerning crates, pip packages etc labels Aug 16, 2024
@Wumpf
Copy link
Member

Wumpf commented Aug 16, 2024

FYI I just landed emilk/egui#4964
It already picked the right wgpu versions here though :)

@emilk emilk force-pushed the emilk/update-egui-wgpu branch from d6aa3ab to b530459 Compare August 20, 2024 14:36
@emilk emilk added the exclude from changelog PRs with this won't show up in CHANGELOG.md label Aug 26, 2024
@emilk emilk force-pushed the emilk/update-egui-wgpu branch from 5b40076 to 489ab26 Compare August 28, 2024 13:34
height: 1080,
});

// TODO(emilk): port this to the winit 0.30 API, using maybe https://docs.rs/winit/latest/winit/platform/web/trait.EventLoopExtWebSys.html ?
Copy link
Member Author

Choose a reason for hiding this comment

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

I gave up porting the wasm32 portion of the examples to latest winit

@emilk emilk added the do-not-merge Do not merge this PR label Aug 29, 2024
@emilk emilk marked this pull request as ready for review August 29, 2024 08:23
@@ -195,7 +195,7 @@ export class WebViewer {

this.#handle = new WebHandle_class({ ...options, fullscreen });
try {
await this.#handle.start(this.#canvas.id);
Copy link
Member

Choose a reason for hiding this comment

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

We should also remove all the this.#id shenanigans here, seeing as it's no longer used

@emilk emilk removed the do-not-merge Do not merge this PR label Sep 1, 2024
Copy link
Member

@jprochazk jprochazk left a comment

Choose a reason for hiding this comment

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

Web stuff LGTM

@abey79 abey79 self-requested a review September 2, 2024 08:01
Copy link
Member

@abey79 abey79 left a comment

Choose a reason for hiding this comment

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

Looks good!

Comment on lines +79 to +80
// winit 0.30.5 spams about `set_cursor_visible` calls. It's gone on winit master, so hopefully gone in next winit release.
"winit",
Copy link
Member

Choose a reason for hiding this comment

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

add a TODO/issue to track that?

Copy link
Member Author

Choose a reason for hiding this comment

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

We don't really have a system in place for tracking new releases… this is a very minor thing anyways (we rarely care about debug logs from winit)

Comment on lines +329 to +330
let table_builder = egui_extras::TableBuilder::new(ui)
.id_source(chunk_store.id())
Copy link
Member

Choose a reason for hiding this comment

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

niiice

@emilk emilk merged commit bd3cc54 into main Sep 2, 2024
34 checks passed
@emilk emilk deleted the emilk/update-egui-wgpu branch September 2, 2024 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies concerning crates, pip packages etc exclude from changelog PRs with this won't show up in CHANGELOG.md 🔺 re_renderer affects re_renderer itself
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants