dropped QOpenGLTexture for raw textures

This commit is contained in:
itsmattkc
2019-03-20 15:40:11 +11:00
parent 4c1bc0d3c8
commit 9b2b7bc949
7 changed files with 60 additions and 74 deletions
-2
View File
@@ -1124,8 +1124,6 @@ void Cacher::CloseWorker() {
avformat_close_input(&formatCtx);
}
clip->reset();
qInfo() << "Clip closed on track" << clip->track();
}
+1 -1
View File
@@ -66,7 +66,7 @@ void FramebufferObject::Create(QOpenGLContext *ctx, int width, int height)
);*/
ctx->functions()->glTexImage2D(
GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA, GL_FLOAT, nullptr
GL_TEXTURE_2D, 0, GL_RGBA16F, width, height, 0, GL_RGBA, GL_FLOAT, nullptr
);
// set texture filtering to bilinear
+8 -1
View File
@@ -468,7 +468,7 @@ GLuint compose_sequence(ComposeSequenceParams &params) {
params.texture_failed = true;
} else {
// retrieve ID from c->texture
textureID = c->texture->textureId();
textureID = c->texture;
}
if (textureID == 0) {
@@ -530,6 +530,13 @@ GLuint compose_sequence(ComposeSequenceParams &params) {
}
#ifndef NO_OCIO
// Convert texture to float
if (textureID != c->fbo.at(0).texture() && textureID != c->fbo.at(1).texture()) {
textureID = draw_clip(params.ctx, params.pipeline, c->fbo.at(fbo_switcher), textureID, true);
fbo_switcher = !fbo_switcher;
}
// Convert frame from source to linear colorspace
if (olive::CurrentConfig.enable_color_management)
{