nearly finished gles transition

2019-03-17 18:19:12 +11:00
parent c8496ac2a8
commit 05ac0314d7
19 changed files with 344 additions and 392 deletions
@@ -52,6 +52,13 @@ struct ComposeSequenceParams {
     */
    QOpenGLContext* ctx;

+    /**
+     * @brief The OpenGL pipeline used for rendering
+     *
+     * \see olive::rendering::GetPipeline().
+     */
+    QOpenGLShaderProgram* pipeline;
+
    /**
     * @brief The sequence to compose
     *
@@ -403,4 +410,13 @@ void close_active_clips(Sequence* s);

 void UpdateOCIOGLState(const ComposeSequenceParams &params);

+namespace olive {
+  namespace rendering {
+    extern GLfloat blit_vertices[];
+    extern GLfloat blit_texcoords[];
+    void Blit(QOpenGLShaderProgram* pipeline);
+    QOpenGLShaderProgramPtr GetPipeline();
+  }
+}
+
 #endif // RENDERFUNCTIONS_H