Rename glsl_manager.h to filter_glsl_manager.h, to be consistent with the .cpp file.

[mlt] / src / modules / opengl / filter_glsl_manager.cpp

diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp
index cd479b74a492b5c0ca2aec39fc62fd95ec225710..35c6074e89e05a270ff5d54be72e224159bb02c7 100644 (file)
--- a/src/modules/opengl/filter_glsl_manager.cpp
+++ b/src/modules/opengl/filter_glsl_manager.cpp
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string>
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/init.h>
 #include <movit/util.h>
 #include <movit/effect_chain.h>
@@ -33,6 +33,14 @@ extern "C" {
 #include <framework/mlt_factory.h>
 }
 
+#if defined(__DARWIN__)
+#include <OpenGL/OpenGL.h>
+#elif defined(WIN32)
+#include <wingdi.h>
+#else
+#include <GL/glx.h>
+#endif
+
 void deleteManager(GlslManager *p)
 {
        delete p;
@@ -62,6 +70,10 @@ GlslManager::~GlslManager()
 {
        mlt_log_debug(get_service(), "%s\n", __FUNCTION__);
        cleanupContext();
+// XXX If there is still a frame holding a reference to a texture after this
+// destructor is called, then it will crash in release_texture().
+//     while (texture_list.peek_back())
+//             delete (glsl_texture) texture_list.pop_back();
        delete initEvent;
        delete closeEvent;
 }
@@ -73,10 +85,18 @@ GlslManager* GlslManager::get_instance()
 
 glsl_fbo GlslManager::get_fbo(int width, int height)
 {
+#if defined(__DARWIN__)
+       CGLContextObj context = CGLGetCurrentContext();
+#elif defined(WIN32)
+       HGLRC context = wglGetCurrentContext();
+#else
+       GLXContext context = glXGetCurrentContext();
+#endif
+
        lock();
        for (int i = 0; i < fbo_list.count(); ++i) {
                glsl_fbo fbo = (glsl_fbo) fbo_list.peek(i);
-               if (!fbo->used && (fbo->width == width) && (fbo->height == height)) {
+               if (!fbo->used && (fbo->width == width) && (fbo->height == height) && (fbo->context == context)) {
                        fbo->used = 1;
                        unlock();
                        return fbo;
@@ -98,6 +118,7 @@ glsl_fbo GlslManager::get_fbo(int width, int height)
        fbo->width = width;
        fbo->height = height;
        fbo->used = 1;
+       fbo->context = context;
        lock();
        fbo_list.push_back(fbo);
        unlock();
@@ -124,18 +145,31 @@ glsl_texture GlslManager::get_texture(int width, int height, GLint internal_form
                        return tex;
                }
        }
+
+       // Recycle a glsl_texture with deleted glTexture.
+       glsl_texture gtex = 0;
+       for (int i = 0; i < texture_list.count(); ++i) {
+               glsl_texture tex = (glsl_texture) texture_list.peek(i);
+               if (!tex->used && !tex->width && !tex->height) {
+                       gtex = tex;
+                       break;
+               }
+       }
        unlock();
 
        GLuint tex = 0;
        glGenTextures(1, &tex);
-       if (!tex)
+       if (!tex) {
+               glDeleteTextures(1, &tex);
                return NULL;
+       }
 
-       glsl_texture gtex = new glsl_texture_s;
        if (!gtex) {
-               glDeleteTextures(1, &tex);
-               return NULL;
+               gtex = new glsl_texture_s;
+               if (!gtex)
+                       return NULL;
        }
+
        glBindTexture( GL_TEXTURE_2D, tex );
        glTexImage2D( GL_TEXTURE_2D, 0, internal_format, width, height, 0, internal_format, GL_UNSIGNED_BYTE, NULL );
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
@@ -198,10 +232,12 @@ void GlslManager::cleanupContext()
                glDeleteFramebuffers(1, &fbo->fbo);
                delete fbo;
        }
-       while (texture_list.peek_back()) {
-               glsl_texture texture = (glsl_texture) texture_list.pop_back();
+       for (int i = 0; i < texture_list.count(); ++i) {
+               glsl_texture texture = (glsl_texture) texture_list.peek(i);
                glDeleteTextures(1, &texture->texture);
-               delete texture;
+               texture->used = 0;
+               texture->width = 0;
+               texture->height = 0;
        }
        if (pbo) {
                glDeleteBuffers(1, &pbo->pbo);
@@ -422,6 +458,8 @@ int GlslManager::render_frame_rgba(mlt_service service, mlt_frame frame, int wid
        render_fbo( service, chain, fbo->fbo, width, height );
 
        // Read FBO into PBO
+       glBindFramebuffer( GL_FRAMEBUFFER, fbo->fbo );
+       check_error();
        glBindBuffer( GL_PIXEL_PACK_BUFFER_ARB, pbo->pbo );
        check_error();
        glBufferData( GL_PIXEL_PACK_BUFFER_ARB, img_size, NULL, GL_STREAM_READ );