various small code cleanups and improvements

Largely refactoring work to make the code somewhat nicer to work with.
2019-12-26 19:00:08 +11:00
parent 83077c939e
commit 61c60e00d6
87 changed files with 596 additions and 567 deletions
@@ -25,7 +25,7 @@
 #include <QOpenGLFunctions>
 #include <QOpenGLTexture>

-#include "render/backend/opengl/functions.h"
+#include "render/backend/opengl/openglrenderfunctions.h"
 #include "render/backend/opengl/openglshader.h"

 ViewerGLWidget::ViewerGLWidget(QWidget *parent) :
@@ -141,7 +141,7 @@ void ViewerGLWidget::paintGL()
    f->glBindTexture(GL_TEXTURE_2D, texture_);

    // Blit using the pipeline retrieved in initializeGL()
-    olive::gl::OCIOBlit(pipeline_, ocio_lut_, true, matrix_);
+    OpenGLRenderFunctions::OCIOBlit(pipeline_, ocio_lut_, true, matrix_);

    // Release retrieved texture
    f->glBindTexture(GL_TEXTURE_2D, 0);