large scale renderer rework

- Abstracts all OpenGL functionality including UI objects
- Cleans up several rendering codepaths
- Improves threading functionality
- Removes old code and problematic functions
This commit is contained in:
itsmattkc
2020-11-10 11:24:51 +11:00
parent 52b98f3fa3
commit 1d61f89920
42 changed files with 927 additions and 820 deletions
+66 -36
View File
@@ -20,25 +20,59 @@
#include "manageddisplay.h"
#include <QHBoxLayout>
#include <QMessageBox>
#include "render/backend/opengl/openglrenderer.h"
#include "render/rendermanager.h"
OLIVE_NAMESPACE_ENTER
ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) :
QOpenGLWidget(parent),
QWidget(parent),
color_manager_(nullptr),
color_service_(nullptr)
{
setContextMenuPolicy(Qt::CustomContextMenu);
attached_renderer_ = new OpenGLRenderer();
QHBoxLayout* layout = new QHBoxLayout(this);
layout->setSpacing(0);
layout->setMargin(0);
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
// Create OpenGL widget
inner_widget_ = new ManagedDisplayWidgetOpenGL();
connect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
&ManagedDisplayWidgetOpenGL::OnInit,
this, &ManagedDisplayWidget::OnInit, Qt::DirectConnection);
connect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
&ManagedDisplayWidgetOpenGL::OnDestroy,
this, &ManagedDisplayWidget::OnDestroy, Qt::DirectConnection);
connect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
&ManagedDisplayWidgetOpenGL::OnPaint,
this, &ManagedDisplayWidget::OnPaint, Qt::DirectConnection);
connect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
&ManagedDisplayWidgetOpenGL::frameSwapped,
this, &ManagedDisplayWidget::frameSwapped, Qt::DirectConnection);
// Create OpenGL renderer
attached_renderer_ = new OpenGLRenderer(this);
} else {
inner_widget_ = nullptr;
}
layout->addWidget(inner_widget_);
}
ManagedDisplayWidget::~ManagedDisplayWidget()
{
ContextCleanup();
OnDestroy();
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
disconnect(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_),
&ManagedDisplayWidgetOpenGL::OnDestroy,
this, &ManagedDisplayWidget::OnDestroy);
}
}
void ManagedDisplayWidget::ConnectColorManager(ColorManager *color_manager)
@@ -111,17 +145,6 @@ ColorProcessorPtr ManagedDisplayWidget::color_service()
return color_service_;
}
void ManagedDisplayWidget::ContextCleanup()
{
makeCurrent();
color_service_ = nullptr;
attached_renderer_->Destroy();
doneCurrent();
}
void ManagedDisplayWidget::ShowDefaultContextMenu()
{
Menu m(this);
@@ -178,24 +201,27 @@ void ManagedDisplayWidget::MenuColorspaceSelect(QAction *action)
SetColorTransform(color_manager()->GetCompliantColorSpace(ColorTransform(action->data().toString())));
}
void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
void ManagedDisplayWidget::OnDestroy()
{
makeCurrent();
color_transform_ = transform;
SetupColorProcessor();
ColorProcessorChangedEvent();
doneCurrent();
attached_renderer_->Destroy();
}
void ManagedDisplayWidget::initializeGL()
void ManagedDisplayWidget::SetColorTransform(const ColorTransform &transform)
{
color_transform_ = transform;
SetupColorProcessor();
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ManagedDisplayWidget::ContextCleanup, Qt::DirectConnection);
ColorProcessorChangedEvent();
}
static_cast<OpenGLRenderer*>(attached_renderer_)->Init(context());
void ManagedDisplayWidget::OnInit()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
QOpenGLContext* context = static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_)->context();
static_cast<OpenGLRenderer*>(attached_renderer_)->Init(context);
static_cast<OpenGLRenderer*>(attached_renderer_)->PostInit();
}
}
void ManagedDisplayWidget::EnableDefaultContextMenu()
@@ -208,6 +234,20 @@ void ManagedDisplayWidget::ColorProcessorChangedEvent()
update();
}
void ManagedDisplayWidget::makeCurrent()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_)->makeCurrent();
}
}
void ManagedDisplayWidget::doneCurrent()
{
if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_)->doneCurrent();
}
}
Menu* ManagedDisplayWidget::GetDisplayMenu(QMenu* parent, bool auto_connect)
{
QStringList displays = color_manager()->ListAvailableDisplays();
@@ -277,35 +317,25 @@ Menu* ManagedDisplayWidget::GetLookMenu(QMenu* parent, bool auto_connect)
void ManagedDisplayWidget::SetupColorProcessor()
{
if (!context()) {
return;
}
color_service_ = nullptr;
if (color_manager_) {
// (Re)create color processor
try {
color_service_ = ColorProcessor::Create(color_manager_,
color_manager_->GetReferenceColorSpace(),
color_transform_);
} catch (OCIO::Exception& e) {
QMessageBox::critical(this,
tr("OpenColorIO Error"),
tr("Failed to set color configuration: %1").arg(e.what()),
QMessageBox::Ok);
}
} else {
color_service_ = nullptr;
}
emit ColorProcessorChanged(std::static_pointer_cast<ColorProcessor>(color_service_));
emit ColorProcessorChanged(color_service_);
}
OLIVE_NAMESPACE_EXIT
+75 -11
View File
@@ -29,7 +29,49 @@
OLIVE_NAMESPACE_ENTER
class ManagedDisplayWidget : public QOpenGLWidget
class ManagedDisplayWidgetOpenGL : public QOpenGLWidget
{
Q_OBJECT
public:
ManagedDisplayWidgetOpenGL(QWidget* parent = nullptr) :
QOpenGLWidget(parent)
{
}
signals:
void OnInit();
void OnPaint();
void OnDestroy();
protected:
virtual void initializeGL() override
{
connect(context(), &QOpenGLContext::aboutToBeDestroyed,
this, &ManagedDisplayWidgetOpenGL::OnDestroy);
emit OnInit();
}
virtual void paintGL() override
{
emit OnPaint();
}
private slots:
void DestroyListener()
{
makeCurrent();
emit OnDestroy();
doneCurrent();
}
};
class ManagedDisplayWidget : public QWidget
{
Q_OBJECT
public:
@@ -94,17 +136,14 @@ signals:
*/
void ColorManagerChanged(ColorManager* color_manager);
void frameSwapped();
protected:
/**
* @brief Provides access to the color processor (nullptr if none is set)
*/
ColorProcessorPtr color_service();
/**
* @brief Override when setting up OpenGL context
*/
virtual void initializeGL() override;
/**
* @brief Enables a context menu that allows simple access to the DVL pipeline
*/
@@ -117,6 +156,31 @@ protected:
*/
virtual void ColorProcessorChangedEvent();
Renderer* renderer() const
{
return attached_renderer_;
}
void makeCurrent();
void doneCurrent();
protected slots:
/**
* @brief Called whenever the internal rendering context has been created
*/
virtual void OnInit();
/**
* @brief Called while the internal rendering context is being rendered
*/
virtual void OnPaint() = 0;
/**
* @brief Called just before the internal rendering context is destroyed
*/
virtual void OnDestroy();
private:
/**
* @brief Call this if this user has selected a different display/view/look to recreate the processor
@@ -128,6 +192,11 @@ private:
*/
void ClearOCIOLutTexture();
/**
* @brief Main drawing surface abstraction
*/
QWidget* inner_widget_;
/**
* @brief Renderer abstraction
*/
@@ -154,11 +223,6 @@ private slots:
*/
void ColorConfigChanged();
/**
* @brief Cleans up resources if context is about to be destroyed
*/
void ContextCleanup();
/**
* @brief The default context menu shown
*/