R7: pure C ABI display boundary + engine visibility closure
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:
@@ -54,22 +54,22 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent)
|
||||
return oakengine_render_manager_backend_to_string(backend, buf,
|
||||
sz);
|
||||
});
|
||||
attached_renderer_ = static_cast<Renderer *>(
|
||||
attached_renderer_ =
|
||||
oakengine_display_renderer_create_dynamic(
|
||||
backend.toUtf8().constData(), this));
|
||||
backend.toUtf8().constData(), this);
|
||||
if (!attached_renderer_) {
|
||||
qWarning()
|
||||
<< "Failed to load dynamic render backend for viewer, falling back to OpenGL";
|
||||
attached_renderer_ = static_cast<Renderer *>(
|
||||
oakengine_display_renderer_create_opengl(this));
|
||||
attached_renderer_ =
|
||||
oakengine_display_renderer_create_opengl(this);
|
||||
}
|
||||
}
|
||||
#else
|
||||
attached_renderer_ = static_cast<Renderer *>(
|
||||
oakengine_display_renderer_create_opengl(this));
|
||||
attached_renderer_ =
|
||||
oakengine_display_renderer_create_opengl(this);
|
||||
#endif
|
||||
|
||||
if (attached_renderer_->is_open_gl()) {
|
||||
if (oakengine_display_renderer_is_open_gl(attached_renderer_)) {
|
||||
// OpenGL path
|
||||
inner_widget_ = new ManagedDisplayWidgetOpenGL();
|
||||
inner_widget_->setAttribute(Qt::WA_TranslucentBackground, false);
|
||||
@@ -363,17 +363,16 @@ void ManagedDisplayWidget::set_inner_mouse_tracking(bool e)
|
||||
}
|
||||
}
|
||||
|
||||
VideoParams ManagedDisplayWidget::get_viewport_params() const
|
||||
oak_video_params ManagedDisplayWidget::get_viewport_params() const
|
||||
{
|
||||
int device_width = width() * devicePixelRatioF();
|
||||
int device_height = height() * devicePixelRatioF();
|
||||
PixelFormat device_format = static_cast<PixelFormat::Format>(
|
||||
OAK_CONFIG("OfflinePixelFormat").toInt());
|
||||
int device_format = OAK_CONFIG("OfflinePixelFormat").toInt();
|
||||
oak_video_params pod = {};
|
||||
pod.width = device_width;
|
||||
pod.height = device_height;
|
||||
pod.format = device_format;
|
||||
return video_params_from_pod(pod);
|
||||
return pod;
|
||||
}
|
||||
|
||||
void ManagedDisplayWidget::update()
|
||||
|
||||
Reference in New Issue
Block a user