dropped QOpenGLTexture for raw textures
This commit is contained in:
@@ -1124,8 +1124,6 @@ void Cacher::CloseWorker() {
|
||||
avformat_close_input(&formatCtx);
|
||||
}
|
||||
|
||||
clip->reset();
|
||||
|
||||
qInfo() << "Clip closed on track" << clip->track();
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -468,7 +468,7 @@ GLuint compose_sequence(ComposeSequenceParams ¶ms) {
|
||||
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 ¶ms) {
|
||||
}
|
||||
|
||||
#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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user