oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

R7: pure C ABI display boundary + engine visibility closure

Browse Source 
R7-A (Qwen 3.8 Max): oakengine/display.h rewritten to the POD contract
from r7-pure-abi-plan.md - oak_video_params everywhere, opaque
texture/frame handles with retain/free protocol (engine-heap control
blocks), OakSharedBuffer refcounted wrapper for the QVariant playback
path. All TexturePtr/FramePtr gone from app (47 sites).

R7-B (Qwen 3.8 Max): liboakengine.so exports 3486 -> 19 C++ symbols
(version script oakengine.ver: oakengine_* plus the documented
oakgl/oakvulkan dlopen plugin ABI). oakengine-obj OBJECT library feeds
both the shared lib and the test binaries (-rdynamic so dlopen'd
backends resolve engine objects).

Fix (Kimi K3): producer/consumer type mismatch - viewerdisplay
unpacks OakSharedBufferPtr but viewer.cpp pushed raw void* handles,
so no frame ever reached the display widget (all 5 vulkan viewer
tests timed out with 'never received a texture'). Producers now wrap
with oak_make_shared_frame / oak_make_shared_texture(retain).

Verified: build 0 errors, ctest 45/45, nm U _ZN5olive = 0 in
oak-editor/oak-render-worker/oak-cli, 19 exported C++ symbols in
liboakengine.so (all documented plugin ABI).
This commit is contained in:
Mike-Solar
2026-07-27 00:54:46 +08:00
parent 9b25772267
commit eb634b53ef
33 changed files with 1692 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/multicam/multicamdisplay.cpp
+37 -20
View File
@@ -32,6 +32,7 @@ namespace olive
MulticamDisplay::MulticamDisplay(QWidget *parent)
: super(parent)
, node_(nullptr)
, shader_(nullptr)
, rows_(0)
, cols_(0)
{
@@ -70,47 +71,63 @@ void MulticamDisplay::on_paint()
void MulticamDisplay::on_destroy()
{
shader_ = QVariant();
if (shader_) {
oakengine_display_renderer_destroy_shader(renderer(), shader_);
shader_ = nullptr;
}
}
TexturePtr MulticamDisplay::load_custom_texture_from_frame(const QVariant &v)
void *MulticamDisplay::load_custom_texture_from_frame(const QVariant &v)
{
if (v.canConvert<QVector<TexturePtr>>()) {
QVector<TexturePtr> tex = v.value<QVector<TexturePtr>>();
if (v.canConvert<QVector<void *>>()) {
QVector<void *> tex = v.value<QVector<void *>>();
TexturePtr main;
const VideoParams main_params = this->get_viewport_params();
oakengine_display_renderer_create_texture(renderer(), &main_params,
nullptr, 0, &main);
oak_video_params main_params = this->get_viewport_params();
void *main_tex = oakengine_display_texture_create(
renderer(), &main_params, nullptr, 0);
int rows, cols;
oakengine_multicam_get_rows_and_columns(tex.size(), &rows, &cols);
if (shader_.isNull() || rows_ != rows || cols_ != cols) {
if (!shader_.isNull()) {
renderer()->destroy_native_shader(shader_);
if (!shader_ || rows_ != rows || cols_ != cols) {
if (shader_) {
oakengine_display_renderer_destroy_shader(renderer(), shader_);
}
shader_ = renderer()->create_native_shader(
ShaderCode(generate_shader_code(rows, cols)));
QString code = generate_shader_code(rows, cols);
shader_ = oakengine_display_renderer_create_shader(
renderer(), code.toUtf8().constData(), nullptr);
rows_ = rows;
cols_ = cols;
}
ShaderJob job;
// Build name and texture arrays for multi-texture blit
const int count = tex.size();
QVector<QByteArray> name_storage(count);
QVector<const char *> names(count);
QVector<void *> textures(count);
for (int i = 0; i < tex.size(); i++) {
for (int i = 0; i < count; i++) {
int c, r;
oakengine_multicam_index_to_row_cols(i, rows, cols, &r, &c);
job.insert(QStringLiteral("tex_%1_%2")
.arg(QString::number(r), QString::number(c)),
NodeValue(NodeValue::k_texture, tex.at(i)));
name_storage[i] = QStringLiteral("tex_%1_%2")
.arg(QString::number(r), QString::number(c))
.toUtf8();
names[i] = name_storage[i].constData();
textures[i] = tex.at(i);
}
renderer()->blit_to_texture(shader_, job, main.get());
oakengine_display_renderer_blit_shader_multi(
renderer(), shader_, names.data(), textures.data(), count,
main_tex);
return main;
// Release input texture handles (they were retained by the engine)
for (int i = 0; i < count; i++) {
oakengine_display_texture_free(tex.at(i));
}
return main_tex;
} else {
return super::load_custom_texture_from_frame(v);
}