uhh yeah this might be fubar
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
|
||||
#include "common/qtutils.h"
|
||||
#include "node/node.h"
|
||||
#include "render/backend/opengl/openglrenderfunctions.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
@@ -75,7 +74,7 @@ void HistogramScope::CleanUp()
|
||||
doneCurrent();
|
||||
}
|
||||
|
||||
OpenGLShaderPtr HistogramScope::CreateShader()
|
||||
QVariant HistogramScope::CreateShader()
|
||||
{
|
||||
OpenGLShaderPtr pipeline = OpenGLShader::Create();
|
||||
|
||||
|
||||
@@ -36,16 +36,16 @@ public:
|
||||
protected:
|
||||
virtual void initializeGL() override;
|
||||
|
||||
virtual OpenGLShaderPtr CreateShader() override;
|
||||
OpenGLShaderPtr CreateSecondaryShader();
|
||||
virtual QVariant CreateShader() override;
|
||||
QVariant CreateSecondaryShader();
|
||||
|
||||
void AssertAdditionalTextures();
|
||||
|
||||
virtual void DrawScope() override;
|
||||
|
||||
private:
|
||||
OpenGLShaderPtr pipeline_secondary_;
|
||||
OpenGLTexture texture_row_sums_;
|
||||
QVariant pipeline_secondary_;
|
||||
QVariant texture_row_sums_;
|
||||
|
||||
private slots:
|
||||
void CleanUp();
|
||||
|
||||
@@ -54,7 +54,7 @@ void ScopeBase::showEvent(QShowEvent* e)
|
||||
UploadTextureFromBuffer();
|
||||
}
|
||||
|
||||
OpenGLShaderPtr ScopeBase::CreateShader()
|
||||
QVariant ScopeBase::CreateShader()
|
||||
{
|
||||
return OpenGLShader::CreateDefault();
|
||||
}
|
||||
|
||||
@@ -22,10 +22,7 @@
|
||||
#define SCOPEBASE_H
|
||||
|
||||
#include "codec/frame.h"
|
||||
#include "render/backend/opengl/openglcolorprocessor.h"
|
||||
#include "render/backend/opengl/openglframebuffer.h"
|
||||
#include "render/backend/opengl/openglshader.h"
|
||||
#include "render/backend/opengl/opengltexture.h"
|
||||
#include "render/colorprocessor.h"
|
||||
#include "widget/manageddisplay/manageddisplay.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
@@ -47,35 +44,28 @@ protected:
|
||||
|
||||
virtual void showEvent(QShowEvent* e) override;
|
||||
|
||||
virtual OpenGLShaderPtr CreateShader();
|
||||
virtual QVariant CreateShader();
|
||||
|
||||
virtual void DrawScope();
|
||||
|
||||
OpenGLShaderPtr pipeline()
|
||||
QVariant pipeline()
|
||||
{
|
||||
return pipeline_;
|
||||
}
|
||||
|
||||
OpenGLTexture& managed_tex()
|
||||
QVariant managed_tex()
|
||||
{
|
||||
return managed_tex_;
|
||||
}
|
||||
|
||||
OpenGLFramebuffer& framebuffer()
|
||||
{
|
||||
return framebuffer_;
|
||||
}
|
||||
|
||||
private:
|
||||
void UploadTextureFromBuffer();
|
||||
|
||||
OpenGLShaderPtr pipeline_;
|
||||
QVariant pipeline_;
|
||||
|
||||
OpenGLTexture texture_;
|
||||
QVariant texture_;
|
||||
|
||||
OpenGLTexture managed_tex_;
|
||||
|
||||
OpenGLFramebuffer framebuffer_;
|
||||
QVariant managed_tex_;
|
||||
|
||||
Frame* buffer_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user