Skip to content

Commit 00fc430

Browse files
committed
Merge branch 'master' into fix-stroke-alignment-outside
2 parents 54e7ea3 + e56f858 commit 00fc430

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2191
-399
lines changed

Cargo.lock

Lines changed: 67 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
members = [
33
"editor",
44
"desktop",
5+
"desktop/wrapper",
56
"proc-macros",
67
"frontend/wasm",
78
"node-graph/gapplication-io",
@@ -159,6 +160,7 @@ syn = { version = "2.0", default-features = false, features = [
159160
"proc-macro",
160161
] }
161162
kurbo = { version = "0.11.0", features = ["serde"] }
163+
lyon_geom = "1.0"
162164
petgraph = { version = "0.7.1", default-features = false, features = [
163165
"graphmap",
164166
] }

desktop/Cargo.toml

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ edition = "2024"
99
rust-version = "1.87"
1010

1111
[features]
12-
default = ["gpu"]
13-
gpu = ["graphite-editor/gpu"]
12+
default = ["gpu", "accelerated_paint"]
13+
gpu = ["graphite-desktop-wrapper/gpu"]
14+
15+
# Hardware acceleration features
16+
accelerated_paint = ["accelerated_paint_dmabuf", "accelerated_paint_d3d11", "accelerated_paint_iosurface"]
17+
accelerated_paint_dmabuf = ["libc", "ash"]
18+
accelerated_paint_d3d11 = ["windows", "ash"]
19+
accelerated_paint_iosurface = ["objc2-io-surface", "objc2-metal", "core-foundation"]
1420

1521
[dependencies]
1622
# # Local dependencies
17-
graphite-editor = { path = "../editor", features = [
18-
"gpu",
19-
"ron",
20-
"vello",
21-
] }
22-
graphene-std = { workspace = true }
23-
graph-craft = { workspace = true }
24-
wgpu-executor = { workspace = true }
23+
graphite-desktop-wrapper = { path = "wrapper" }
2524

2625
wgpu = { workspace = true }
2726
winit = { workspace = true, features = ["serde"] }
@@ -39,4 +38,26 @@ vello = { workspace = true }
3938
derivative = { workspace = true }
4039
rfd = { workspace = true }
4140
open = { workspace = true }
42-
image = { workspace = true }
41+
42+
# Hardware acceleration dependencies
43+
ash = { version = "0.38", optional = true }
44+
45+
# Windows-specific dependencies
46+
[target.'cfg(windows)'.dependencies]
47+
windows = { version = "0.58", features = [
48+
"Win32_Graphics_Direct3D11",
49+
"Win32_Graphics_Direct3D12",
50+
"Win32_Graphics_Dxgi",
51+
"Win32_Graphics_Dxgi_Common",
52+
"Win32_Foundation"
53+
], optional = true }
54+
55+
# macOS-specific dependencies
56+
[target.'cfg(target_os = "macos")'.dependencies]
57+
objc2-io-surface = { version = "0.3", optional = true }
58+
objc2-metal = { version = "0.3", optional = true }
59+
core-foundation = { version = "0.9", optional = true }
60+
61+
# Linux-specific dependencies
62+
[target.'cfg(target_os = "linux")'.dependencies]
63+
libc = { version = "0.2", optional = true }

0 commit comments

Comments
 (0)