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

feat(render): dynamic OpenGL/Vulkan backend split and backend-neutral viewer

Browse Source 
- Extract libolive-rendercore static library to minimize backend link boundary.
- Add DynamicRenderer adapter with C ABI (oakgl/oakvulkan shared libs).
- Make OAK_ENABLE_DYNAMIC_RENDER_BACKEND default ON with OpenGL fallback.
- Implement VulkanRenderer prototype (textures, shaders, UBO blit, readback).
- Add backend-neutral viewer readback path (offscreen -> QImage -> QPainter).
- Refactor PluginRenderer to be renderer-agnostic; OFX plugins fall back to CPU
  path on non-OpenGL backends while preserving OpenGL render path.
- Add Renderer::AttachOutputTexture/DetachOutputTexture and C ABI forwards.
- Update docs/zh/render-backend-dynamic-plan.md for Phase 3/4/5.
This commit is contained in:
Mike-Solar
2026-07-13 10:19:29 +08:00
parent 5fc8232671
commit 225f8505c2
42 changed files with 3042 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/manageddisplay/manageddisplay.cpp
+45 -26
View File
@@ -40,13 +40,33 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent)
: QWidget(parent)
, color_manager_(nullptr)
, color_service_(nullptr)
, is_backend_neutral_(false)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
// Create OpenGL widget
// Create renderer
#ifdef OAK_ENABLE_DYNAMIC_RENDER_BACKEND
{
auto *dynamic_renderer = new DynamicRenderer(
RenderManager::BackendToString(
RenderManager::instance()->requested_backend()),
this);
if (!dynamic_renderer->Load()) {
qWarning() << "Failed to load dynamic render backend for viewer, falling back to OpenGL";
delete dynamic_renderer;
attached_renderer_ = new OpenGLRenderer(this);
} else {
attached_renderer_ = dynamic_renderer;
}
}
#else
attached_renderer_ = new OpenGLRenderer(this);
#endif
if (attached_renderer_->IsOpenGL()) {
// OpenGL path
inner_widget_ = new ManagedDisplayWidgetOpenGL();
inner_widget_->setAttribute(Qt::WA_TranslucentBackground, false);
connect(static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_),
@@ -64,16 +84,6 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent)
inner_widget_->installEventFilter(this);
// Create renderer bound to the widget's OpenGL context.
#ifdef OAK_ENABLE_DYNAMIC_RENDER_BACKEND
attached_renderer_ = new DynamicRenderer(
RenderManager::BackendToString(
RenderManager::instance()->requested_backend()),
this);
#else
attached_renderer_ = new OpenGLRenderer(this);
#endif
// Create widget wrapper for OpenGL window
#ifdef USE_QOPENGLWINDOW
wrapper_ = QWidget::createWindowContainer(
@@ -83,19 +93,29 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent)
#endif
layout->addWidget(wrapper_);
} else {
inner_widget_ = nullptr;
wrapper_ = nullptr;
// Backend-neutral path (Vulkan, etc.)
is_backend_neutral_ = true;
auto *bn_widget = new ManagedDisplayWidgetBackendNeutral(this);
inner_widget_ = bn_widget;
inner_widget_->setAttribute(Qt::WA_OpaquePaintEvent);
inner_widget_->installEventFilter(this);
connect(bn_widget, &ManagedDisplayWidgetBackendNeutral::OnPaint, this,
&ManagedDisplayWidget::OnPaint, Qt::DirectConnection);
wrapper_ = inner_widget_;
layout->addWidget(wrapper_);
}
}
ManagedDisplayWidget::~ManagedDisplayWidget()
{
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR_INNER;
if (!is_backend_neutral_) {
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR_INNER;
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
disconnect(static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_),
&ManagedDisplayWidgetOpenGL::OnDestroy, this,
&ManagedDisplayWidget::OnDestroy);
} else {
OnDestroy();
}
}
@@ -251,7 +271,7 @@ void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
void ManagedDisplayWidget::OnInit()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
if (!is_backend_neutral_) {
QOpenGLContext *context =
static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_)->context();
#ifdef OAK_ENABLE_DYNAMIC_RENDER_BACKEND
@@ -264,6 +284,9 @@ void ManagedDisplayWidget::OnInit()
#endif
static_cast<OpenGLRenderer *>(attached_renderer_)->Init(context);
static_cast<OpenGLRenderer *>(attached_renderer_)->PostInit();
} else {
attached_renderer_->Init();
attached_renderer_->PostInit();
}
}
@@ -280,25 +303,21 @@ void ManagedDisplayWidget::ColorProcessorChangedEvent()
void ManagedDisplayWidget::makeCurrent()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
if (!is_backend_neutral_) {
static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_)->makeCurrent();
}
}
void ManagedDisplayWidget::doneCurrent()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
if (!is_backend_neutral_) {
static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_)->doneCurrent();
}
}
QPaintDevice *ManagedDisplayWidget::paint_device() const
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
return static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_);
} else {
return nullptr;
}
return inner_widget_;
}
void ManagedDisplayWidget::SetInnerMouseTracking(bool e)
@@ -320,8 +339,8 @@ VideoParams ManagedDisplayWidget::GetViewportParams() const
void ManagedDisplayWidget::update()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
static_cast<ManagedDisplayWidgetOpenGL *>(inner_widget_)->update();
if (inner_widget_) {
inner_widget_->update();
}
}
app/widget/manageddisplay/manageddisplay.h
+33
View File
@@ -101,6 +101,32 @@ private slots:
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR_INNER; \
}
/**
* @brief Inner widget for backend-neutral rendering paths (e.g. Vulkan).
*
* It does not own a GL context; instead it forwards Qt paint events to the
* ManagedDisplayWidget so that the viewer can render via QPainter.
*/
class ManagedDisplayWidgetBackendNeutral : public QWidget {
Q_OBJECT
public:
ManagedDisplayWidgetBackendNeutral(QWidget *parent = nullptr)
: QWidget(parent)
{
}
signals:
void OnPaint();
protected:
virtual void paintEvent(QPaintEvent *event) override
{
QWidget::paintEvent(event);
emit OnPaint();
}
};
class ManagedDisplayWidget : public QWidget {
Q_OBJECT
public:
@@ -221,6 +247,11 @@ protected:
void SetInnerMouseTracking(bool e);
bool IsBackendNeutral() const
{
return is_backend_neutral_;
}
QRect GetInnerRect() const
{
return wrapper_ ? wrapper_->rect() : QRect();
@@ -285,6 +316,8 @@ private:
*/
ColorTransform color_transform_;
bool is_backend_neutral_ = false;
private slots:
/**
* @brief Sets all color settings to the defaults pertaining to this configuration