Merge #145: gui: use glow feature instead of wgpu

2e8b72a809155b6ec4989da270a96119956d531e gui: use glow feature instead of wgpu (edouard)

Pull request description:

ACKs for top commit:
  darosior:
    ACK 2e8b72a809155b6ec4989da270a96119956d531e. We don't need an efficient renderer, and it looks like it's helpful for Guix builds.

Tree-SHA512: eb75c2ef6913cd5a90a29843e4d2470f1693b2bdb814ba953dd7ee1d9b27d3a9a95712cd7b7bedf4627853993a9f25fc70a8a12cf7df6c042ae2be72bad3e27b
This commit is contained in:
Antoine Poinsot 2022-12-06 13:20:43 +01:00
commit 6d95aaedec
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
3 changed files with 138 additions and 1 deletions

134
gui/Cargo.lock generated
View File

@ -337,6 +337,15 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
[[package]]
name = "cgl"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
dependencies = [
"libc",
]
[[package]]
name = "checked_int_cast"
version = "1.0.0"
@ -1058,6 +1067,17 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
[[package]]
name = "gl_generator"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
dependencies = [
"khronos_api",
"log",
"xml-rs",
]
[[package]]
name = "glam"
version = "0.21.3"
@ -1088,6 +1108,71 @@ dependencies = [
"log",
]
[[package]]
name = "glutin"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713"
dependencies = [
"cgl",
"cocoa",
"core-foundation",
"glutin_egl_sys",
"glutin_gles2_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
"libloading",
"log",
"objc",
"once_cell",
"osmesa-sys",
"parking_lot 0.12.1",
"raw-window-handle 0.5.0",
"wayland-client",
"wayland-egl",
"winapi",
"winit",
]
[[package]]
name = "glutin_egl_sys"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d"
dependencies = [
"gl_generator",
"winapi",
]
[[package]]
name = "glutin_gles2_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103"
dependencies = [
"gl_generator",
"objc",
]
[[package]]
name = "glutin_glx_sys"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468"
dependencies = [
"gl_generator",
"x11-dl",
]
[[package]]
name = "glutin_wgl_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696"
dependencies = [
"gl_generator",
]
[[package]]
name = "glyph_brush"
version = "0.7.4"
@ -1257,6 +1342,7 @@ dependencies = [
"iced_core",
"iced_futures",
"iced_glow",
"iced_glutin",
"iced_graphics",
"iced_native",
"iced_wgpu",
@ -1304,6 +1390,19 @@ dependencies = [
"log",
]
[[package]]
name = "iced_glutin"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8784b965359a157092fd5615ef31ac170a6109f9b06b20ff4969fdd286d9599b"
dependencies = [
"glutin",
"iced_graphics",
"iced_native",
"iced_winit",
"log",
]
[[package]]
name = "iced_graphics"
version = "0.4.0"
@ -1476,6 +1575,12 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "khronos_api"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]]
name = "kurbo"
version = "0.8.0"
@ -2096,6 +2201,15 @@ dependencies = [
"num-traits",
]
[[package]]
name = "osmesa-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
dependencies = [
"shared_library",
]
[[package]]
name = "ouroboros"
version = "0.13.0"
@ -2746,6 +2860,16 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "shared_library"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
dependencies = [
"lazy_static",
"libc",
]
[[package]]
name = "signal-hook-registry"
version = "1.4.0"
@ -3336,6 +3460,16 @@ dependencies = [
"xcursor",
]
[[package]]
name = "wayland-egl"
version = "0.29.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83281d69ee162b59031c666385e93bde4039ec553b90c4191cdb128ceea29a3a"
dependencies = [
"wayland-client",
"wayland-sys",
]
[[package]]
name = "wayland-protocols"
version = "0.29.4"

View File

@ -19,7 +19,7 @@ liana = { git = "https://github.com/revault/liana", branch = "master", default-f
backtrace = "0.3"
base64 = "0.13"
iced = { version = "0.5", default-features= false, features = ["tokio", "wgpu", "svg", "qr_code"] }
iced = { version = "0.5", default-features= false, features = ["tokio", "glow", "svg", "qr_code"] }
iced_native = "0.6"
iced_lazy = { version = "0.2"}

View File

@ -296,6 +296,9 @@ pub fn setup_logger(log_level: log::LevelFilter) -> Result<(), fern::InitError>
.level_for("wgpu_core", log::LevelFilter::Off)
.level_for("wgpu_hal", log::LevelFilter::Off)
.level_for("gfx_backend_vulkan", log::LevelFilter::Off)
.level_for("iced_glutin", log::LevelFilter::Off)
.level_for("iced_glow", log::LevelFilter::Off)
.level_for("glow_glyph", log::LevelFilter::Off)
.level_for("naga", log::LevelFilter::Off)
.level_for("mio", log::LevelFilter::Off);