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
+42 -101
View File
@@ -22,6 +22,7 @@
#include <QPainter>
#include <QtMath>
#include <QVector2D>
#include "common/qtutils.h"
#include "node/node.h"
@@ -35,74 +36,33 @@ HistogramScope::HistogramScope(QWidget* parent) :
HistogramScope::~HistogramScope()
{
CleanUp();
if (context()) {
disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this,
&HistogramScope::CleanUp);
}
OnDestroy();
}
void HistogramScope::initializeGL()
void HistogramScope::OnInit()
{
ScopeBase::initializeGL();
ScopeBase::OnInit();
pipeline_secondary_ = CreateSecondaryShader();
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this,
&HistogramScope::CleanUp, Qt::DirectConnection);
ShaderCode secondary_code(Node::ReadFileAsString(":/shaders/rgbhistogram_secondary.frag"),
Node::ReadFileAsString(":/shaders/rgbhistogram.vert"));
pipeline_secondary_ = renderer()->CreateNativeShader(secondary_code);
}
void HistogramScope::AssertAdditionalTextures()
void HistogramScope::OnDestroy()
{
if (!texture_row_sums_.IsCreated()
|| texture_row_sums_.width() != width()
|| texture_row_sums_.height() != height()) {
texture_row_sums_.Destroy();
texture_row_sums_.Create(context(), VideoParams(width(),
height(), managed_tex().format()));
}
ScopeBase::OnDestroy();
pipeline_secondary_.clear();
texture_row_sums_ = nullptr;
}
void HistogramScope::CleanUp()
ShaderCode HistogramScope::GenerateShaderCode()
{
makeCurrent();
pipeline_secondary_ = nullptr;
texture_row_sums_.Destroy();
doneCurrent();
return ShaderCode(Node::ReadFileAsString(":/shaders/rgbhistogram.frag"),
Node::ReadFileAsString(":/shaders/default.vert"));
}
QVariant HistogramScope::CreateShader()
{
OpenGLShaderPtr pipeline = OpenGLShader::Create();
pipeline->create();
pipeline->addShaderFromSourceCode(QOpenGLShader::Vertex,
OpenGLShader::CodeDefaultVertex());
pipeline->addShaderFromSourceCode(QOpenGLShader::Fragment,
Node::ReadFileAsString(":/shaders/rgbhistogram.frag"));
pipeline->link();
return pipeline;
}
OpenGLShaderPtr HistogramScope::CreateSecondaryShader()
{
OpenGLShaderPtr shader = OpenGLShader::Create();
shader->create();
shader->addShaderFromSourceCode(QOpenGLShader::Vertex,
Node::ReadFileAsString(":/shaders/rgbhistogram.vert"));
shader->addShaderFromSourceCode(QOpenGLShader::Fragment,
Node::ReadFileAsString(":/shaders/rgbhistogram_secondary.frag"));
shader->link();
return shader;
}
void HistogramScope::DrawScope()
void HistogramScope::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
{
float histogram_scale = 0.80f;
// This value is eyeballed for usefulness. Until we have a geometry
@@ -111,40 +71,21 @@ void HistogramScope::DrawScope()
float histogram_base = 2.5f;
float histogram_power = 1.0f / histogram_base;
pipeline()->bind();
pipeline()->setUniformValue("ove_resolution", managed_tex().width(),
managed_tex().height());
pipeline()->setUniformValue("ove_viewport", width(), height());
pipeline()->setUniformValue("histogram_scale", histogram_scale);
pipeline()->release();
Renderer::ShaderUniformMap value_map;
AssertAdditionalTextures();
value_map.insert(QStringLiteral("viewport"), {QVector2D(width(), height()), NodeParam::kVec2});
value_map.insert(QStringLiteral("histogram_scale"), {histogram_scale, NodeParam::kFloat});
value_map.insert(QStringLiteral("histogram_power"), {histogram_power, NodeParam::kFloat});
framebuffer().Attach(&texture_row_sums_, true);
framebuffer().Bind();
if (!texture_row_sums_
|| texture_row_sums_->width() != this->width()
|| texture_row_sums_->height() != this->height()) {
texture_row_sums_ = renderer()->CreateTexture(VideoParams(width(), height(), managed_tex->format()));
}
managed_tex().Bind();
renderer()->Blit(managed_tex.get(), pipeline, value_map, texture_row_sums_.get());
OpenGLRenderFunctions::Blit(pipeline());
managed_tex().Release();
framebuffer().Release();
framebuffer().Detach();
pipeline_secondary_->bind();
pipeline_secondary_->setUniformValue("ove_resolution",
texture_row_sums_.width(), texture_row_sums_.height());
pipeline_secondary_->setUniformValue("ove_viewport", width(), height());
pipeline_secondary_->setUniformValue("histogram_scale", histogram_scale);
pipeline_secondary_->setUniformValue("histogram_power", histogram_power);
pipeline_secondary_->release();
texture_row_sums_.Bind();
OpenGLRenderFunctions::Blit(pipeline_secondary_);
texture_row_sums_.Release();
renderer()->Blit(texture_row_sums_.get(), pipeline_secondary_, value_map);
// Draw line overlays
QPainter p(this);
@@ -172,28 +113,28 @@ void HistogramScope::DrawScope()
float histogram_dim_x = ceil((width() - 1.0) * histogram_scale);
float histogram_dim_y = ceil((height() - 1.0) * histogram_scale);
float histogram_start_dim_x =
((width() - 1.0) - histogram_dim_x) / 2.0f;
((width() - 1.0) - histogram_dim_x) / 2.0f;
float histogram_start_dim_y =
((height() - 1.0) - histogram_dim_y) / 2.0f;
((height() - 1.0) - histogram_dim_y) / 2.0f;
float histogram_end_dim_x = (width() - 1.0) - histogram_start_dim_x;
// for (int i=0; i <= histogram_steps; i++) {
for(std::vector<float>::iterator it = histogram_increments.begin();
it != histogram_increments.end(); it++) {
it != histogram_increments.end(); it++) {
histogram_lines[it - histogram_increments.begin()].setLine(
histogram_start_dim_x,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
histogram_start_dim_y,
histogram_end_dim_x,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
histogram_start_dim_y);
label = QString::number(
*it * 100, 'f', 1) + "%";
font_x_offset = QFontMetricsWidth(font_metrics, label) + 4;
histogram_start_dim_x,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
histogram_start_dim_y,
histogram_end_dim_x,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
histogram_start_dim_y);
label = QString::number(
*it * 100, 'f', 1) + "%";
font_x_offset = QFontMetricsWidth(font_metrics, label) + 4;
p.drawText(
histogram_start_dim_x - font_x_offset,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
p.drawText(
histogram_start_dim_x - font_x_offset,
(histogram_dim_y * pow(1.0 - *it, histogram_base)) +
histogram_start_dim_y + font_y_offset, label);
}
p.drawLines(histogram_lines);
+8 -9
View File
@@ -33,22 +33,21 @@ public:
virtual ~HistogramScope() override;
protected:
virtual void initializeGL() override;
protected slots:
virtual void OnInit() override;
virtual QVariant CreateShader() override;
virtual void OnDestroy() override;
protected:
virtual ShaderCode GenerateShaderCode() override;
QVariant CreateSecondaryShader();
void AssertAdditionalTextures();
virtual void DrawScope() override;
virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline) override;
private:
QVariant pipeline_secondary_;
QVariant texture_row_sums_;
Renderer::TexturePtr texture_row_sums_;
private slots:
void CleanUp();
};
OLIVE_NAMESPACE_EXIT
+33 -69
View File
@@ -20,8 +20,6 @@
#include "scopebase.h"
#include "render/backend/opengl/openglrenderfunctions.h"
OLIVE_NAMESPACE_ENTER
ScopeBase::ScopeBase(QWidget* parent) :
@@ -33,11 +31,7 @@ ScopeBase::ScopeBase(QWidget* parent) :
ScopeBase::~ScopeBase()
{
CleanUp();
if (context()) {
disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ScopeBase::CleanUp);
}
OnDestroy();
}
void ScopeBase::SetBuffer(Frame *frame)
@@ -54,18 +48,9 @@ void ScopeBase::showEvent(QShowEvent* e)
UploadTextureFromBuffer();
}
QVariant ScopeBase::CreateShader()
void ScopeBase::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
{
return OpenGLShader::CreateDefault();
}
void ScopeBase::DrawScope()
{
managed_tex().Bind();
OpenGLRenderFunctions::Blit(pipeline());
managed_tex().Release();
renderer()->Blit(managed_tex.get(), pipeline, Renderer::ShaderUniformMap());
}
void ScopeBase::UploadTextureFromBuffer()
@@ -77,17 +62,18 @@ void ScopeBase::UploadTextureFromBuffer()
if (buffer_) {
makeCurrent();
if (!texture_.IsCreated()
|| texture_.width() != buffer_->width()
|| texture_.height() != buffer_->height()
|| texture_.format() != buffer_->format()) {
texture_.Destroy();
managed_tex_.Destroy();
if (!texture_
|| texture_->width() != buffer_->width()
|| texture_->height() != buffer_->height()
|| texture_->format() != buffer_->format()) {
texture_ = nullptr;
managed_tex_ = nullptr;
texture_.Create(context(), buffer_);
managed_tex_.Create(context(), buffer_->video_params());
texture_ = renderer()->CreateTexture(buffer_->video_params(),
buffer_->data(), buffer_->linesize_pixels());
managed_tex_ = renderer()->CreateTexture(buffer_->video_params());
} else {
texture_.Upload(buffer_);
texture_->Upload(buffer_->data(), buffer_->linesize_pixels());
}
doneCurrent();
@@ -96,58 +82,36 @@ void ScopeBase::UploadTextureFromBuffer()
update();
}
void ScopeBase::CleanUp()
void ScopeBase::OnInit()
{
makeCurrent();
pipeline_ = nullptr;
texture_.Destroy();
managed_tex_.Destroy();
framebuffer_.Destroy();
doneCurrent();
}
void ScopeBase::initializeGL()
{
ManagedDisplayWidget::initializeGL();
pipeline_ = CreateShader();
framebuffer_.Create(context());
connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ScopeBase::CleanUp, Qt::DirectConnection);
ManagedDisplayWidget::OnInit();
UploadTextureFromBuffer();
pipeline_ = renderer()->CreateNativeShader(GenerateShaderCode());
}
void ScopeBase::paintGL()
void ScopeBase::OnPaint()
{
QOpenGLFunctions* f = context()->functions();
// Clear display surface
renderer()->ClearDestination();
f->glClearColor(0, 0, 0, 0);
f->glClear(GL_COLOR_BUFFER_BIT);
if (buffer_ && pipeline() && texture_.IsCreated()) {
if (buffer_) {
// Convert reference frame to display space
framebuffer_.Attach(&managed_tex_);
framebuffer_.Bind();
renderer()->BlitColorManaged(color_service(), texture_.get(), managed_tex_.get());
texture_.Bind();
f->glViewport(0, 0, texture_.width(), texture_.height());
color_service()->ProcessOpenGL();
texture_.Release();
framebuffer_.Release();
framebuffer_.Detach();
f->glViewport(0, 0, width(), height());
DrawScope();
renderer()->SetViewport(width(), height());
DrawScope(managed_tex_, pipeline_);
}
}
void ScopeBase::OnDestroy()
{
ManagedDisplayWidget::OnDestroy();
managed_tex_ = nullptr;
texture_ = nullptr;
pipeline_.clear();
}
OLIVE_NAMESPACE_EXIT
+16 -21
View File
@@ -37,41 +37,36 @@ public:
public slots:
void SetBuffer(Frame* frame);
protected slots:
virtual void OnInit() override;
virtual void OnPaint() override;
virtual void OnDestroy() override;
protected:
virtual void initializeGL() override;
virtual void paintGL() override;
virtual void showEvent(QShowEvent* e) override;
virtual QVariant CreateShader();
virtual ShaderCode GenerateShaderCode() = 0;
virtual void DrawScope();
QVariant pipeline()
{
return pipeline_;
}
QVariant managed_tex()
{
return managed_tex_;
}
/**
* @brief Draw function
*
* Override this if your sub-class scope needs extra drawing.
*/
virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline);
private:
void UploadTextureFromBuffer();
QVariant pipeline_;
QVariant texture_;
Renderer::TexturePtr texture_;
QVariant managed_tex_;
Renderer::TexturePtr managed_tex_;
Frame* buffer_;
private slots:
void CleanUp();
};
OLIVE_NAMESPACE_EXIT
+38 -39
View File
@@ -24,10 +24,11 @@
#include <QPainter>
#include <QtMath>
#include <QDebug>
#include <QVector2D>
#include <QVector3D>
#include "common/qtutils.h"
#include "node/node.h"
#include "render/backend/opengl/openglrenderfunctions.h"
OLIVE_NAMESPACE_ENTER
@@ -36,49 +37,46 @@ WaveformScope::WaveformScope(QWidget* parent) :
{
}
QVariant WaveformScope::CreateShader()
WaveformScope::~WaveformScope()
{
OpenGLShaderPtr pipeline = OpenGLShader::Create();
pipeline->create();
pipeline->addShaderFromSourceCode(QOpenGLShader::Vertex,
Node::ReadFileAsString(":/shaders/rgbwaveform.vert"));
pipeline->addShaderFromSourceCode(QOpenGLShader::Fragment,
Node::ReadFileAsString(":/shaders/rgbwaveform.frag"));
pipeline->link();
return pipeline;
OnDestroy();
}
void WaveformScope::DrawScope()
ShaderCode WaveformScope::GenerateShaderCode()
{
return ShaderCode(Node::ReadFileAsString(":/shaders/rgbwaveform.frag"),
Node::ReadFileAsString(":/shaders/rgbwaveform.vert"));
}
void WaveformScope::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
{
float waveform_scale = 0.80f;
// Draw waveform through shader
pipeline()->bind();
pipeline()->setUniformValue("ove_resolution", managed_tex().width(), managed_tex().height());
pipeline()->setUniformValue("ove_viewport", width(), height());
GLfloat luma[3] = {0.0, 0.0, 0.0};
color_manager()->GetDefaultLumaCoefs(luma);
pipeline()->setUniformValue("luma_coeffs", luma[0], luma[1], luma[2]);
Renderer::ShaderUniformMap value_map;
// Set viewport size
value_map.insert(QStringLiteral("viewport"),
{QVector2D(width(), height()), NodeParam::kVec2});
// Set luma coefficients
float luma_coeffs[3] = {0.0f, 0.0f, 0.0f};
color_manager()->GetDefaultLumaCoefs(luma_coeffs);
value_map.insert(QStringLiteral("luma_coeffs"),
{QVector3D(luma_coeffs[0], luma_coeffs[1], luma_coeffs[2]), NodeParam::kVec3});
// Scale of the waveform relative to the viewport surface.
pipeline()->setUniformValue("waveform_scale", waveform_scale);
value_map.insert(QStringLiteral("waveform_scale"), {waveform_scale, NodeParam::kFloat});
pipeline()->release();
managed_tex().Bind();
OpenGLRenderFunctions::Blit(pipeline());
managed_tex().Release();
renderer()->Blit(managed_tex.get(), pipeline, value_map);
float waveform_dim_x = ceil((width() - 1.0) * waveform_scale);
float waveform_dim_y = ceil((height() - 1.0) * waveform_scale);
float waveform_start_dim_x =
((width() - 1.0) - waveform_dim_x) / 2.0f;
((width() - 1.0) - waveform_dim_x) / 2.0f;
float waveform_start_dim_y =
((height() - 1.0) - waveform_dim_y) / 2.0f;
((height() - 1.0) - waveform_dim_y) / 2.0f;
float waveform_end_dim_x = (width() - 1.0) - waveform_start_dim_x;
// Draw line overlays
@@ -100,18 +98,19 @@ void WaveformScope::DrawScope()
for (int i=0; i <= ire_steps; i++) {
ire_lines[i].setLine(
waveform_start_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y,
waveform_end_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y);
label = QString::number(1.0 - (i * ire_increment), 'f', 1);
font_x_offset = QFontMetricsWidth(font_metrics, label) + 4;
waveform_start_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y,
waveform_end_dim_x,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y);
label = QString::number(1.0 - (i * ire_increment), 'f', 1);
font_x_offset = QFontMetricsWidth(font_metrics, label) + 4;
p.drawText(
waveform_start_dim_x - font_x_offset,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y + font_y_offset,
label);
p.drawText(
waveform_start_dim_x - font_x_offset,
(waveform_dim_y * (i * ire_increment)) + waveform_start_dim_y + font_y_offset,
label);
}
p.drawLines(ire_lines);
}
+5 -3
View File
@@ -31,10 +31,12 @@ class WaveformScope : public ScopeBase
public:
WaveformScope(QWidget* parent = nullptr);
protected:
virtual QVariant CreateShader() override;
virtual ~WaveformScope() override;
virtual void DrawScope() override;
protected:
virtual ShaderCode GenerateShaderCode() override;
virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline) override;
};