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 wgpu 0.20, fixing crashes with some linux setups #6171

Merged
merged 5 commits into from
Jun 14, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into andreas/update-wgpu
Wumpf committed Jun 13, 2024
commit 09bc8db4c73190522cfa8f24ce5288a212552e51
41 changes: 17 additions & 24 deletions Cargo.lock
Original file line number Diff line number Diff line change
@@ -1554,7 +1554,7 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
[[package]]
name = "ecolor"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"bytemuck",
"emath",
@@ -1564,7 +1564,7 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ahash",
"bytemuck",
@@ -1600,7 +1600,7 @@ dependencies = [
[[package]]
name = "egui"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"accesskit",
"ahash",
@@ -1617,7 +1617,7 @@ dependencies = [
[[package]]
name = "egui-wgpu"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ahash",
"bytemuck",
@@ -1636,7 +1636,7 @@ dependencies = [
[[package]]
name = "egui-winit"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"accesskit_winit",
"ahash",
@@ -1655,30 +1655,28 @@ dependencies = [
[[package]]
name = "egui_commonmark"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfa3ef705fc0cf25a37a674a3e85323b0f00ec5fc735c0c23981b5735d0bf0d"
source = "git+https://github.com/rerun-io/egui_commonmark?rev=63d5c8933445b9ea9088c4a50b71f4ede1f3c247#63d5c8933445b9ea9088c4a50b71f4ede1f3c247"
dependencies = [
"egui",
"egui_commonmark_backend",
"egui_extras",
"pulldown-cmark 0.10.3",
"pulldown-cmark 0.11.0",
]

[[package]]
name = "egui_commonmark_backend"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6edb3b68439f6b17e9318acdcef383681253c2c84158f3b991fccb2d2c6f0e47"
version = "0.16.1"
source = "git+https://github.com/rerun-io/egui_commonmark?rev=63d5c8933445b9ea9088c4a50b71f4ede1f3c247#63d5c8933445b9ea9088c4a50b71f4ede1f3c247"
dependencies = [
"egui",
"egui_extras",
"pulldown-cmark 0.10.3",
"pulldown-cmark 0.11.0",
]

[[package]]
name = "egui_extras"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ahash",
"egui",
@@ -1694,7 +1692,7 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ahash",
"bytemuck",
@@ -1712,7 +1710,7 @@ dependencies = [
[[package]]
name = "egui_plot"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ahash",
"egui",
@@ -1755,7 +1753,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "emath"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"bytemuck",
"serde",
@@ -1856,7 +1854,7 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=3dca4c667f30fe7199433d3607efbe15c76a1cb6#3dca4c667f30fe7199433d3607efbe15c76a1cb6"
source = "git+https://github.com/emilk/egui.git?rev=814ad0783cf8b826a258e29ed4c50ae6daa2e890#814ad0783cf8b826a258e29ed4c50ae6daa2e890"
dependencies = [
"ab_glyph",
"ahash",
@@ -3994,9 +3992,9 @@ dependencies = [

[[package]]
name = "pulldown-cmark"
version = "0.10.3"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0"
dependencies = [
"bitflags 2.5.0",
"memchr",
@@ -7931,8 +7929,3 @@ dependencies = [
"quote",
"syn 1.0.109",
]

[[patch.unused]]
name = "egui_commonmark"
version = "0.15.0"
source = "git+https://github.com/rerun-io/egui_commonmark?rev=c539d7e3f133e5a4a422f0d641d5c5af36dddb0f#c539d7e3f133e5a4a422f0d641d5c5af36dddb0f"
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -454,13 +454,13 @@ missing_errors_doc = "allow"
# As a last resport, patch with a commit to our own repository.
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

ecolor = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
eframe = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
egui = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
emath = { git = "https://github.com/emilk/egui.git", rev = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" } # egui wgpu 0.20 branch: https://github.com/emilk/egui/pull/4560
ecolor = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
eframe = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
egui = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13
emath = { git = "https://github.com/emilk/egui.git", rev = "814ad0783cf8b826a258e29ed4c50ae6daa2e890" } # egui master 2024-06-13

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
You are viewing a condensed version of this merge commit. You can view the full changes here.