restored previous renderer iteration for porting
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
ViewerWidget::ViewerWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
video_renderer_(nullptr),
|
||||
viewer_node_(nullptr),
|
||||
playback_speed_(0)
|
||||
{
|
||||
@@ -161,7 +162,6 @@ void ViewerWidget::ConnectViewerNode(ViewerOutput *node)
|
||||
}
|
||||
|
||||
video_renderer_->SetViewerNode(viewer_node_);
|
||||
opengl_backend_.SetViewerNode(viewer_node_);
|
||||
}
|
||||
|
||||
void ViewerWidget::DisconnectViewerNode()
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/output/viewer/viewer.h"
|
||||
#include "render/backend/opengl/openglbackend.h"
|
||||
#include "render/backend/videorenderbackend.h"
|
||||
#include "viewerglwidget.h"
|
||||
#include "viewersizer.h"
|
||||
#include "widget/playbackcontrols/playbackcontrols.h"
|
||||
@@ -111,7 +111,7 @@ private:
|
||||
void PushScrubbedAudio();
|
||||
|
||||
// FIXME: Test code only
|
||||
OpenGLBackend opengl_backend_;
|
||||
VideoRendererProcessor* video_renderer_;
|
||||
// End test code
|
||||
|
||||
ViewerSizer* sizer_;
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
#include <QOpenGLFunctions>
|
||||
#include <QOpenGLTexture>
|
||||
|
||||
#include "render/gl/functions.h"
|
||||
#include "render/gl/shadergenerators.h"
|
||||
#include "render/backend/opengl/functions.h"
|
||||
#include "render/backend/opengl/openglshader.h"
|
||||
|
||||
ViewerGLWidget::ViewerGLWidget(QWidget *parent) :
|
||||
QOpenGLWidget(parent),
|
||||
@@ -87,7 +87,7 @@ void ViewerGLWidget::paintGL()
|
||||
void ViewerGLWidget::SetupPipeline()
|
||||
{
|
||||
// Re-retrieve pipeline pertaining to this context
|
||||
pipeline_ = olive::ShaderGenerator::OCIOPipeline(context(),
|
||||
pipeline_ = OpenGLShader::CreateOCIO(context(),
|
||||
ocio_lut_,
|
||||
color_service_->GetProcessor(),
|
||||
true);
|
||||
|
||||
Reference in New Issue
Block a user