split fbo and texture into two separate objects

This commit is contained in:
itsmattkc
2019-08-27 15:36:13 +10:00
parent 46ea071b99
commit 4b5516abb5
14 changed files with 459 additions and 271 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
#include "alphaover.h"
#include "render/rendertypes.h"
#include "render/rendertexture.h"
AlphaOverBlend::AlphaOverBlend()
{
@@ -35,5 +35,5 @@ void AlphaOverBlend::Process(const rational &time)
//GLuint base_tex = base_input_->get_value(time).value<GLuint>();
// FIXME: Does nothing
texture_output()->set_value(blend_input()->get_value(time).value<RenderTexture>());
texture_output()->set_value(QVariant::fromValue(blend_input()->get_value(time).value<RenderTexturePtr>()));
}
+1 -1
View File
@@ -72,7 +72,7 @@ QString MediaInput::Description()
void MediaInput::Release()
{
buffer_.Destroy();
texture_.Destroy();
decoder_ = nullptr;
}
+2 -2
View File
@@ -28,7 +28,7 @@
#include "render/colorservice.h"
// FIXME: Test code only
#include "render/texturebuffer.h"
#include "render/rendertexture.h"
#include "render/gl/shaderptr.h"
// End test code
@@ -65,7 +65,7 @@ private:
NodeOutput* texture_output_;
TextureBuffer buffer_;
RenderTexture texture_;
DecoderPtr decoder_;
-1
View File
@@ -26,7 +26,6 @@
#include <QImage>
#include <QtMath>
#include "render/rendertypes.h"
#include "renderpath.h"
#include "rendererprobe.h"