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.

Sign up for GitHub

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

Jump to bottom

Update egui and wgpu #4111

Merged
merged 33 commits into from
Dec 1, 2023
Merged

Update egui and wgpu #4111

merged 33 commits into from
Dec 1, 2023

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Nov 1, 2023 •
edited by emilk
Loading

What

Test Matrix

Make sure to click through a few examples to cover at least points, lines and meshes. (Arkit is a good one!)

  • Test window-related stuff on Linux:

    • check that resizing the window works
    • that the icon shows
    • that file->open works
    • that the DPI is sane and persisted on restart
    • Look for any other weird regressions

  • Mac

    • native
    • WebGL Firefox
    • WebGL Chrome
    • WebGL Safari
    • (optional) WebGPU Chrome

  • Linux

    • native
    • WebGL Firefox
    • WebGL Chrome

  • Windows

    • native
    • WebGL Firefox
    • WebGL Chrome
    • WebGL Edge
    • (optional) WebGPU Chrome

  • Merge egui PR

Checklist

@Wumpf Wumpf added 🔺 re_renderer affects re_renderer itself dependencies concerning crates, pip packages etc include in changelog labels Nov 1, 2023
@Wumpf Wumpf marked this pull request as ready for review November 1, 2023 11:08
@Wumpf Wumpf added the do-not-merge Do not merge this PR label Nov 1, 2023
@Wumpf
Copy link
Member Author

Wumpf commented Nov 1, 2023 •
edited
Loading

(don't merge tag for depending on an egui PR commit)

jleibs
jleibs approved these changes Nov 1, 2023
View reviewed changes
Copy link
Member

@jleibs jleibs left a comment

Choose a reason for hiding this comment

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

Changes all look straightforward

@Wumpf Wumpf added blocked can't make progress right now and removed do-not-merge Do not merge this PR labels Nov 2, 2023
@emilk
Copy link
Member

emilk commented Nov 16, 2023

I suggest we wait with this until we are ready for the next egui release, containing the new multi-viewport PR and probably a winit update: https://github.com/emilk/egui/milestone/2

@emilk emilk changed the title Update to wgpu 0.18 Update egui and wgpu Nov 17, 2023
@emilk emilk added the do-not-merge Do not merge this PR label Nov 19, 2023
@abey79 abey79 mentioned this pull request Nov 21, 2023
Merged
4 tasks
@emilk
Copy link
Member

emilk commented Nov 23, 2023 •
edited by Wumpf
Loading

Testing:

  • Linux
  • macOS
  • Windows

Test:

  • check that resizing the window works
  • that the icon shows
  • that file->open works
  • that the DPI is sane and persisted on restart
  • Look for any other weird regressions

@emilk
Copy link
Member

emilk commented Nov 23, 2023

Ok, everything is updated and ready

@emilk emilk removed blocked can't make progress right now do-not-merge Do not merge this PR labels Nov 24, 2023
@teh-cmc
Copy link
Member

teh-cmc commented Nov 27, 2023

Breaks window resizing and frequently crashes on wgpu errors on X11 (XWayland) and Wayland

@rerun-io rerun-io deleted a comment from abey79 Nov 27, 2023
@emilk
Copy link
Member

emilk commented Nov 27, 2023 •
edited
Loading

@teh-cmc Does emilk/egui#3643 fix your problems? i.e. patching egui-winit to e6815ae1ea212732683e3f05be7cadf17d228a9a

@emilk emilk added the do-not-merge Do not merge this PR label Nov 27, 2023
@teh-cmc teh-cmc mentioned this pull request Nov 28, 2023
Closed
@teh-cmc
Copy link
Member

teh-cmc commented Nov 28, 2023

@teh-cmc Does emilk/egui#3643 fix your problems? i.e. patching egui-winit to e6815ae1ea212732683e3f05be7cadf17d228a9a

yep, fixed

@emilk emilk removed the do-not-merge Do not merge this PR label Nov 30, 2023
@emilk
Copy link
Member

emilk commented Dec 1, 2023

Clement says it is good now. I'm gonna give WebGPU a whirl, then merge it.

@emilk
Copy link
Member

emilk commented Dec 1, 2023

WebGPU works well in Arc (chromium) on my Mac

@emilk emilk merged commit 68b68b6 into main Dec 1, 2023
39 of 42 checks passed
@emilk emilk deleted the andreas/wgpu-0.18 branch December 1, 2023 08:58
emilk pushed a commit that referenced this pull request Dec 1, 2023
@abey79
Remove the "can't copy/cut on Safari" warning from the Getting Starte…
275639c 
…d guides (#4300)

### What

egui 0.24 will fix the bug where coping from Safari was impossible:
- emilk/egui#3513

This PR removes the related warnings in the in-app Getting Started
guides.

- May be blocked by
lampsitter/egui_commonmark#21??
- Blocked by #4111
- Fixes #4292

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/4300) (if
applicable)
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG

- [PR Build Summary](https://build.rerun.io/pr/4300)
- [Docs
preview](https://rerun.io/preview/0a0e58f6c169798c01d1932ecec3fb51cfe6360e/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/0a0e58f6c169798c01d1932ecec3fb51cfe6360e/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)
abey79 added a commit that referenced this pull request Dec 1, 2023
@abey79 @Wumpf @emilk
Restore egui_plot auto-bounds state after dragging the time cursor …
e3dd6f3 
…in timeseries space views (#4270)

### What

* Fixes #4246
* Depends on emilk/egui#3586
* Blocked on #4111

![Export-1701442441839](https://github.com/rerun-io/rerun/assets/49431240/d02f7d64-801a-4fe4-8ec1-20524ba78bd5)


### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested [demo.rerun.io](https://demo.rerun.io/pr/4270) (if
applicable)
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG

- [PR Build Summary](https://build.rerun.io/pr/4270)
- [Docs
preview](https://rerun.io/preview/2706326572e06cf2623136a62fee75d75b490fdd/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/2706326572e06cf2623136a62fee75d75b490fdd/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

---------

Co-authored-by: Andreas Reich <[email protected]>
Co-authored-by: Emil Ernerfeldt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleibs jleibs jleibs approved these changes

Assignees
No one assigned
Labels
dependencies concerning crates, pip packages etc include in changelog 🔺 re_renderer affects re_renderer itself
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update to wgpu 0.18
5 participants
@Wumpf @emilk @teh-cmc @jleibs @abey79