Merge branch 'master' into worktree-faces-scrfd-mbf
Build and test / Desktop (Linux) (push) Failing after 25s
Build and test / Layer separation (push) Successful in 22s
Traceability / Requirement traces (push) Successful in 58s
🐳 Android image / Build and push (push) Successful in 1s
Build and test / android-image (push) Successful in 1s
Build and test / Android (aarch64) (push) Failing after 33m26s
Build and test / Desktop (Linux) (push) Failing after 25s
Build and test / Layer separation (push) Successful in 22s
Traceability / Requirement traces (push) Successful in 58s
🐳 Android image / Build and push (push) Successful in 1s
Build and test / android-image (push) Successful in 1s
Build and test / Android (aarch64) (push) Failing after 33m26s
# Conflicts: # docs/traceability.md # ui/dr-ui/src/develop.rs # ui/dr-ui/src/segmentation.rs
This commit is contained in:
+13
-6
@@ -65,11 +65,14 @@ rusqlite.workspace = true
|
||||
# Consequence worth stating plainly: the desktop app now needs a working wgpu
|
||||
# adapter to open a window at all. Slint refuses a CPU adapter for this
|
||||
# renderer unless `SLINT_WGPU_CPU` is set in the environment.
|
||||
slint = { workspace = true, features = [
|
||||
"compat-1-2",
|
||||
"renderer-femtovg-wgpu",
|
||||
"unstable-wgpu-29",
|
||||
] }
|
||||
# TEST BUILD: the wgpu renderer features have moved to the desktop-only
|
||||
# dependency below. On Android they made `AndroidWindowAdapter` choose
|
||||
# `SkiaRenderer::default_wgpu_29`, and so put the app on wgpu's Vulkan
|
||||
# swapchain — which hardcodes `preTransform = IDENTITY` (gfx-rs/wgpu#3345).
|
||||
# Without them the Android backend uses `SkiaRenderer::default`, which on
|
||||
# Android resolves to Skia over OpenGL, where the driver owns the display
|
||||
# rotation and there is no transform to get wrong.
|
||||
slint = { workspace = true, features = ["compat-1-2"] }
|
||||
wgpu.workspace = true
|
||||
anyhow.workspace = true
|
||||
# `SettingsError` distinguishes an io failure from a malformed file, which the
|
||||
@@ -85,7 +88,11 @@ serde_norway = { workspace = true, optional = true }
|
||||
# under `cfg(target_os = "android")`, so this only has to name the feature;
|
||||
# cargo resolves it away entirely on desktop.
|
||||
[target.'cfg(not(target_os = "android"))'.dependencies]
|
||||
slint = { workspace = true, features = ["backend-winit"] }
|
||||
slint = { workspace = true, features = [
|
||||
"backend-winit",
|
||||
"renderer-femtovg-wgpu",
|
||||
"unstable-wgpu-29",
|
||||
] }
|
||||
|
||||
[target.'cfg(target_os = "android")'.dependencies]
|
||||
slint = { workspace = true, features = ["backend-android-activity-06"] }
|
||||
|
||||
Reference in New Issue
Block a user