mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2025-12-23 10:11:54 +00:00
Unify feature dependencies with workspace dependencies (#2736)
* graph-craft: fix direct wasm build * graph-craft: fix no serde feature failing to compile * graph-craft: make wgpu-executor properly optional * workspace: unify `image` formats in workspace * workspace: turn most dependencies into workspace deps, no actual changes * workspace: unify dependency features in workspace dep
This commit is contained in:
parent
990d5b37cf
commit
ca5ca863cc
22 changed files with 151 additions and 143 deletions
|
|
@ -11,13 +11,13 @@ gpu = ["graphene-std/gpu", "graphene-std/wgpu"]
|
|||
|
||||
[dependencies]
|
||||
# Local dependencies
|
||||
graphene-std = { path = "../gstd", features = ["serde"] }
|
||||
graph-craft = { path = "../graph-craft" }
|
||||
wgpu-executor = { path = "../wgpu-executor" }
|
||||
graphene-std = { workspace = true, features = ["serde"] }
|
||||
graph-craft = { workspace = true }
|
||||
wgpu-executor = { workspace = true }
|
||||
graphene-core = { workspace = true }
|
||||
dyn-any = { workspace = true }
|
||||
|
||||
# Workspace dependencies
|
||||
graphene-core = { workspace = true }
|
||||
dyn-any = { workspace = true, features = ["log-bad-types", "glam"] }
|
||||
log = { workspace = true }
|
||||
glam = { workspace = true }
|
||||
futures = { workspace = true }
|
||||
|
|
@ -29,9 +29,7 @@ serde = { workspace = true, optional = true }
|
|||
[dev-dependencies]
|
||||
# Workspace dependencies
|
||||
graph-craft = { workspace = true, features = ["loading"] }
|
||||
|
||||
# Required dependencies
|
||||
criterion = { version = "0.5", features = ["html_reports"]}
|
||||
criterion = { workspace = true }
|
||||
|
||||
# Benchmarks
|
||||
[[bench]]
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
|
|||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => RasterDataTable<CPU>]),
|
||||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => GraphicGroupTable]),
|
||||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Vec<DVec2>]),
|
||||
#[cfg(feature = "gpu")]
|
||||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Arc<WasmSurfaceHandle>]),
|
||||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => WindowHandle]),
|
||||
async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Option<WgpuSurface>]),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue