diff --git a/Cargo.lock b/Cargo.lock index bdf8a8e1..0116649c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1817,13 +1817,10 @@ dependencies = [ name = "graphite-desktop" version = "0.1.0" dependencies = [ - "base64 0.22.1", - "bytemuck", "cef", "dirs", - "graphite-editor", + "futures", "include_dir", - "pollster", "thiserror 2.0.12", "tracing", "tracing-subscriber", @@ -3629,12 +3626,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - [[package]] name = "portable-atomic" version = "1.11.1" diff --git a/Cargo.toml b/Cargo.toml index 035af638..85944723 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -156,6 +156,10 @@ iai-callgrind = { version = "0.12.3" } ndarray = "0.16.1" strum = { version = "0.26.3", features = ["derive"] } dirs = "6.0" +cef = "138.5.0" +include_dir = "0.7.4" +tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } +tracing = "0.1.41" [profile.dev] opt-level = 1 diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 9e73c32a..581f0ed6 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -9,25 +9,23 @@ edition = "2024" rust-version = "1.87" [features] -default = ["gpu"] -gpu = ["graphite-editor/gpu"] +# default = ["gpu"] +# gpu = ["graphite-editor/gpu"] [dependencies] # Local dependencies -graphite-editor = { path = "../editor", features = [ - "gpu", - "ron", - "vello", - "decouple-execution", -] } +# graphite-editor = { path = "../editor", features = [ +# "gpu", +# "ron", +# "vello", +# "decouple-execution", +# ] } wgpu = { workspace = true } winit = { workspace = true, features = ["serde"] } -base64.workspace = true -thiserror.workspace = true -pollster = "0.3" -cef = "138.5.0" -tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } -tracing = "0.1.41" -bytemuck = { version = "1.23.1", features = ["derive"] } -include_dir = "0.7.4" -dirs.workspace = true +thiserror = { workspace = true } +futures = { workspace = true } +cef = { workspace = true } +include_dir = { workspace = true } +tracing-subscriber = { workspace = true } +tracing = { workspace = true } +dirs = {workspace = true} diff --git a/desktop/src/app.rs b/desktop/src/app.rs index c713e656..d929a71d 100644 --- a/desktop/src/app.rs +++ b/desktop/src/app.rs @@ -71,7 +71,7 @@ impl ApplicationHandler for WinitApp { ) .unwrap(), ); - let graphics_state = pollster::block_on(GraphicsState::new(window.clone())); + let graphics_state = futures::executor::block_on(GraphicsState::new(window.clone())); self.window = Some(window); self.graphics_state = Some(graphics_state); diff --git a/package.json b/package.json index 55286592..7197418f 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "scripts": { "---------- DEV SERVER ----------": "", "start": "cd frontend && npm start", + "start-desktop": "cd frontend && npm run build-dev && cargo run -p graphite-desktop", "profiling": "cd frontend && npm run profiling", "production": "cd frontend && npm run production", "---------- BUILDS ----------": "",