core: merge oak-common into oak-core
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.
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
//! 运行时装配成 oak-test-plugin.ofx.bundle):filter 上下文、
|
||||
//! Double 参数 gain、双 clip(Source/Output)。插件未构建时相关
|
||||
//! 用例经 [`skip`] 提前返回。
|
||||
//! 单库化后像素路径经 oakrender 值模型(`oak_render::texture::Texture`)
|
||||
//! 单库化后像素路径经 oakrender 值模型(`oak_core::texture::Texture`)
|
||||
//! 驱动;渲染 goldens 待该迁移落地。
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
@@ -42,8 +42,8 @@ use std::sync::Arc;
|
||||
use oak_core::{PixelFormat, Rational};
|
||||
use oak_plugin::host::Host;
|
||||
use oak_plugin::render::{Renderer, Texture};
|
||||
use oak_render::backend::{BackendKind, GpuContextLike};
|
||||
use oak_render::texture::Frame;
|
||||
use oak_core::backend::{BackendKind, GpuContextLike};
|
||||
use oak_core::texture::Frame;
|
||||
|
||||
const GL_PLUGIN_ID: &str = "org.oak.test-plugin.gl";
|
||||
|
||||
@@ -67,7 +67,7 @@ impl GpuContextLike for FakeGlRenderer {
|
||||
&self,
|
||||
_src: u64,
|
||||
_dst: u64,
|
||||
_processor: Option<&oak_render::color::ColorProcessor>,
|
||||
_processor: Option<&oak_core::color::ColorProcessor>,
|
||||
) -> oak_render::error::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ use oak_node::node::{NodeBehavior, NodeCore};
|
||||
use oak_node::traverser::{EvalRequest, Traverser};
|
||||
use oak_node::value::{NodeValue, ValueType};
|
||||
use oak_plugin::host::Host;
|
||||
use oak_render::texture::Texture;
|
||||
use oak_core::texture::Texture;
|
||||
|
||||
const PLUGIN_ID: &str = "org.oak.test-plugin";
|
||||
const IDENTITY_ID: &str = "org.oak.test-plugin.identity";
|
||||
|
||||
Reference in New Issue
Block a user