Merge pull request #1085 from jaytaph/cfg-removals

render backend cleanups

Author: jaytaph

Cargo.lock

@@ -186,8 +186,9 @@ getrandom = { workspace = true, features = ["wasm_js"] }
 getrandom_v02 = { package = "getrandom", version = "0.2", features = ["js"] }
 getrandom_v03 = { package = "getrandom", version = "0.3", features = ["wasm_js"] }
 # No default features on WASM: excludes sqlite_cookie_store (needs C SQLite) and parley_layout (needs freetype).
-gosub_engine = { path = "./crates/gosub_engine", default-features = false, features = ["backend_vello"] }
-gosub_render_pipeline = { path = "./crates/gosub_render_pipeline", features = ["backend_vello"] }
+gosub_engine = { path = "./crates/gosub_engine", default-features = false }
+gosub_render_pipeline = { path = "./crates/gosub_render_pipeline" }
+gosub_renderer_vello = { path = "./crates/gosub_renderer_vello" }
 gosub_shared = { version = "0.1.1", path = "./crates/gosub_shared", registry = "gosub" }
 parking_lot = { workspace = true }
 
@@ -210,8 +211,8 @@ gosub_fontmanager = { version = "0.1.0", path = "./crates/gosub_fontmanager", re
 
 [target.'cfg(unix)'.dev-dependencies]
 gtk4 = { workspace = true }
-gosub_engine = { path = "./crates/gosub_engine", features = ["gtk4", "backend_cairo"] }
-gosub_render_pipeline = { path = "./crates/gosub_render_pipeline", features = ["backend_cairo"] }
+gosub_engine = { path = "./crates/gosub_engine" }
+gosub_render_pipeline = { path = "./crates/gosub_render_pipeline" }
 
 [patch.crates-io]
 vello = { git = "https://github.com/linebender/vello", rev = "1b24e77ba4e01d12f5db86a9b1b5f2cf828a6a33" }

Cargo.toml

@@ -8,8 +8,9 @@ name = "gosub-screenshot"
 path = "main.rs"
 
 [dependencies]
-gosub_engine = { path = "../../crates/gosub_engine", features = ["backend_vello"] }
-gosub_render_pipeline = { path = "../../crates/gosub_render_pipeline", features = ["backend_vello"] }
+gosub_engine = { path = "../../crates/gosub_engine" }
+gosub_render_pipeline = { path = "../../crates/gosub_render_pipeline" }
+gosub_renderer_vello = { path = "../../crates/gosub_renderer_vello" }
 vello = { workspace = true }
 image = { workspace = true }
 once_cell = { workspace = true }

bin/gosub-screenshot/Cargo.toml

@@ -10,8 +10,8 @@ use gosub_engine::tab::{TabDefaults, TabId};
 use gosub_engine::zone::{ZoneConfig, ZoneId, ZoneServices};
 use gosub_engine::GosubEngine;
 use gosub_render_pipeline::render::backend::ExternalHandle;
-use gosub_render_pipeline::render::backends::vello::{VelloBackend, WgpuContextProvider};
 use gosub_render_pipeline::render::DefaultCompositor;
+use gosub_renderer_vello::{VelloBackend, WgpuContextProvider};
 use image::ColorType;
 use once_cell::sync::Lazy;
 use parking_lot::RwLock;

bin/gosub-screenshot/main.rs

@@ -15,9 +15,6 @@ gosub_html5 = { version = "0.1.1", path = "../gosub_html5" }
 gosub_css3 = { version = "0.1.2", path = "../gosub_css3" }
 gosub_interface = { version = "0.1.2", path = "../gosub_interface" }
 gosub_render_pipeline = { version = "0.1.0", path = "../gosub_render_pipeline" }
-gosub_renderer_cairo = { version = "0.1.0", path = "../gosub_renderer_cairo", optional = true, default-features = false }
-gosub_renderer_skia = { version = "0.1.0", path = "../gosub_renderer_skia", optional = true }
-gosub_renderer_vello = { version = "0.1.0", path = "../gosub_renderer_vello", optional = true }
 uuid = { workspace = true, features = ["v4", "serde"] }
 reqwest = { workspace = true, default-features = true, features = ["json", "gzip", "brotli", "deflate", "cookies", "rustls", "stream"] }
 tokio = { workspace = true, features = [
@@ -45,12 +42,6 @@ tracing = { workspace = true }
 r2d2 = { version = "0.8", optional = true }
 r2d2_sqlite = { version = "0.33", optional = true, features = ["bundled"] }
 
-gtk4 = { workspace = true, optional = true }
-cairo-rs = { workspace = true, optional = true }
-
-skia-safe = { workspace = true, optional = true }
-
-vello = { workspace = true, optional = true }
 wgpu = { workspace = true, optional = true }
 
 winit = { workspace = true, optional = true }
@@ -91,12 +82,7 @@ gdk4-x11 = { workspace = true, optional = true }
 default = ["sqlite_cookie_store", "parley_layout"]
 ui_eframe = ["dep:eframe", "dep:egui"]
 winit = ["dep:winit", "dep:wgpu"]
-gtk4 = ["dep:gtk4", "dep:cairo-rs"]
 sqlite_cookie_store = ["r2d2", "r2d2_sqlite"]
-backend_cairo = ["dep:cairo-rs", "dep:gosub_renderer_cairo", "gosub_render_pipeline/backend_cairo"]
-backend_cairo_pango = ["backend_cairo", "dep:gtk4", "gosub_renderer_cairo/text_pango"]
-backend_vello = ["dep:vello", "dep:wgpu", "dep:gosub_renderer_vello", "gosub_render_pipeline/backend_vello"]
-backend_skia = ["dep:skia-safe", "dep:gosub_renderer_skia", "gosub_render_pipeline/backend_skia"]
 parley_layout = []
 metrics = []