Mike-Solar
4babbf5de8
oak-common is gone; its modules (configstore, xmlutils, ocioutils,
oiioutils, colormath, colortransform, videoparams, ffmpegutils, ...)
now live in oak-core alongside the value types. The render value/GPU
types moved too: backend (wgpu context + DisplayRenderer), color
(ColorProcessor over ocio-rs), texture, frame, and the commonutil
config helpers.
Fix-ups to make the merged tree build and pass tests:
- oak-core Cargo.toml: wgpu back to 25 (the moved backend code is
written against that API generation); add the toml/quick-xml/image
deps oak-common carried.
- lib.rs: drop the duplicate 'pub mod error;'.
- error.rs: unified OAKCORE_* codes; restore Error::new() and
From<OcioError> from oak-common's error type.
- backend.rs/color.rs: oak_core::/oak_render:: self-references
rewritten to crate::; the shaderfx-dependent GPU effect test moved
to oak-render's shaderfx tests (shaderfx depends on oak-node and
cannot live in oak-core).
- oak-render's error module re-exports oak_core::error::{Error,
Result}; the OAKRENDER_* codes stay as the public-code contract.
- oak-node jobs.rs: ColorProcessor imported from oak_core::color.
- Integration tests repointed at oak_core::{texture, frame, backend,
color, colormath}.
- the display-ICC regression test treats an empty OAK_DISPLAY_ICC as
unset, matching displayicc::env_override_icc.
47 lines
2.1 KiB
TOML
47 lines
2.1 KiB
TOML
[package]
|
|
name = "oak-render"
|
|
version.workspace = true
|
|
edition = "2021"
|
|
description = "Oak Video Editor render engine (Rust)"
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[lib]
|
|
crate-type = ["staticlib", "rlib"]
|
|
|
|
[dependencies]
|
|
oak-core = { path = "../oak-core" }
|
|
# Direct Rust calls (single-lib unification): the decode bridge calls
|
|
# oakcodec's ffi, the node bridge calls oaknode's ffi. Both directions
|
|
# are acyclic (oakcodec → oakcore-rs/oak-ffmpeg-link; oaknode → oakcodec).
|
|
oak-codec = { path = "../oak-codec" }
|
|
oak-node = { path = "../oak-node" }
|
|
# wgpu: portable GPU backend (Metal/Vulkan/GL/DX12 in one safe API) — the
|
|
# direct replacement for the C++ liboakgl2/liboakvulkan backend plugins.
|
|
# Version 25 (2025 stable line); the only GPU dependency.
|
|
wgpu = "25"
|
|
# naga: GLSL → WGSL translation for the node shaders (the embedded GLSL
|
|
# stays the single source of truth, matching the C++ Vulkan backend's
|
|
# mechanical-conversion approach). Pinned to wgpu 25's naga generation;
|
|
# only the GLSL frontend and WGSL writer are compiled.
|
|
naga = { version = "25", default-features = false, features = ["glsl-in", "wgsl-out"] }
|
|
# ocio-rs: safe Rust bindings for OpenColorIO v2.5.2 — the ColorProcessor
|
|
# implementation; OCIO is never rewritten. The `bundled` feature compiles
|
|
# the vendored OpenColorIO C++ sources (cmake/ninja required); without it
|
|
# ocio-sys builds a stub (all color tests then early-return).
|
|
ocio-rs = { version = "0.2", features = ["bundled"] }
|
|
# `std::error::Error` impls for the crate-internal error enum.
|
|
thiserror = "2"
|
|
# M15 S1: physical-memory query for the process-pool worker-count policy
|
|
# (sysctlbyname on macOS / sysconf on Linux) in src/procpool.rs.
|
|
libc = "0.2"
|
|
# M15 S1: the render-worker NDJSON control protocol (src/ipc.rs moved here
|
|
# from oak-worker so both ends of the pipe link one copy; src/procpool.rs
|
|
# is the main-process side).
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
|
|
[dev-dependencies]
|
|
# oakcodec is also a plain dependency above; the dev-dependency re-entry
|
|
# used to enable oakcodec's `test-stubs` host-mocks, which no longer exist
|
|
# (single-lib unification removed the oakcore_audioparams_* C ABI calls).
|