Redo FBO association yet again, this time per-texture.

[movit] / resource_pool.cpp

diff --git a/resource_pool.cpp b/resource_pool.cpp
index 4f2cc2b9ade1e6cc98ec50b50eb30fccbd550a55..a83add2a7117ccfb99bea2cce3afcdb1ed062cdb 100644 (file)
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -17,10 +17,13 @@ using namespace std;
 namespace movit {
 
 ResourcePool::ResourcePool(size_t program_freelist_max_length,
-                           size_t texture_freelist_max_bytes)
+                           size_t texture_freelist_max_bytes,
+                           size_t fbo_freelist_max_length)
        : program_freelist_max_length(program_freelist_max_length),
          texture_freelist_max_bytes(texture_freelist_max_bytes),
-         texture_freelist_bytes(0) {
+         fbo_freelist_max_length(fbo_freelist_max_length),
+         texture_freelist_bytes(0)
+{
        pthread_mutex_init(&lock, NULL);
 }
 
@@ -48,6 +51,17 @@ ResourcePool::~ResourcePool()
        }
        assert(texture_formats.empty());
        assert(texture_freelist_bytes == 0);
+
+       for (list<GLuint>::const_iterator freelist_it = fbo_freelist.begin();
+            freelist_it != fbo_freelist.end();
+            ++freelist_it) {
+               GLuint free_fbo_num = *freelist_it;
+               assert(fbo_formats.count(free_fbo_num) != 0);
+               fbo_formats.erase(free_fbo_num);
+               glDeleteFramebuffers(1, &free_fbo_num);
+               check_error();
+       }
+       assert(fbo_formats.empty());
 }
 
 void ResourcePool::delete_program(GLuint glsl_program_num)
@@ -105,6 +119,15 @@ GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const str
                glLinkProgram(glsl_program_num);
                check_error();
 
+               GLint success;
+               glGetProgramiv(glsl_program_num, GL_LINK_STATUS, &success);
+               if (success == GL_FALSE) {
+                       GLchar error_log[1024] = {0};
+                       glGetProgramInfoLog(glsl_program_num, 1024, NULL, error_log);
+                       fprintf(stderr, "Error linking program: %s\n", error_log);
+                       exit(1);
+               }
+
                if (movit_debug_level == MOVIT_DEBUG_ON) {
                        // Output shader to a temporary file, for easier debugging.
                        static int compiled_shader_num = 0;
@@ -181,8 +204,8 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
        case GL_RG16F:
                format = GL_RG;
                break;
-       case GL_LUMINANCE8:
-               format = GL_LUMINANCE;
+       case GL_R8:
+               format = GL_RED;
                break;
        default:
                // TODO: Add more here as needed.
@@ -225,6 +248,83 @@ void ResourcePool::release_2d_texture(GLuint texture_num)
                texture_formats.erase(free_texture_num);
                glDeleteTextures(1, &free_texture_num);
                check_error();
+
+               // Delete any FBO related to this texture.
+               for (list<GLuint>::iterator fbo_freelist_it = fbo_freelist.begin();
+                    fbo_freelist_it != fbo_freelist.end(); ) {
+                       GLuint fbo_num = *fbo_freelist_it;
+                       map<GLuint, FBO>::const_iterator format_it = fbo_formats.find(fbo_num);
+                       assert(format_it != fbo_formats.end());
+                       if (format_it->second.texture_num == free_texture_num) {
+                               glDeleteFramebuffers(1, &fbo_num);
+                               fbo_freelist.erase(fbo_freelist_it++);
+                       } else {
+                               ++fbo_freelist_it;
+                       }
+               }
+       }
+       pthread_mutex_unlock(&lock);
+}
+
+GLuint ResourcePool::create_fbo(void *context, GLuint texture_num)
+{
+       pthread_mutex_lock(&lock);
+       // See if there's an FBO on the freelist we can use.
+       for (list<GLuint>::iterator freelist_it = fbo_freelist.begin();
+            freelist_it != fbo_freelist.end();
+            ++freelist_it) {
+               GLuint fbo_num = *freelist_it;
+               map<GLuint, FBO>::const_iterator format_it = fbo_formats.find(fbo_num);
+               assert(format_it != fbo_formats.end());
+               if (format_it->second.context == context &&
+                   format_it->second.texture_num == texture_num) {
+                       fbo_freelist.erase(freelist_it);
+                       pthread_mutex_unlock(&lock);
+                       return fbo_num;
+               }
+       }
+
+       // Create a new one.
+       GLuint fbo_num;
+       glGenFramebuffers(1, &fbo_num);
+       check_error();
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo_num);
+       check_error();
+       glFramebufferTexture2D(
+               GL_FRAMEBUFFER,
+               GL_COLOR_ATTACHMENT0,
+               GL_TEXTURE_2D,
+               texture_num,
+               0);
+       check_error();
+       GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+       assert(status == GL_FRAMEBUFFER_COMPLETE);
+       glBindFramebuffer(GL_FRAMEBUFFER, 0);
+       check_error();
+
+       FBO fbo_format;
+       fbo_format.context = context;
+       fbo_format.texture_num = texture_num;
+       assert(fbo_formats.count(fbo_num) == 0);
+       fbo_formats.insert(make_pair(fbo_num, fbo_format));
+
+       pthread_mutex_unlock(&lock);
+       return fbo_num;
+}
+
+void ResourcePool::release_fbo(GLuint fbo_num)
+{
+       pthread_mutex_lock(&lock);
+       fbo_freelist.push_front(fbo_num);
+       assert(fbo_formats.count(fbo_num) != 0);
+
+       while (fbo_freelist.size() > fbo_freelist_max_length) {
+               GLuint free_fbo_num = fbo_freelist.front();
+               fbo_freelist.pop_front();
+               assert(fbo_formats.count(free_fbo_num) != 0);
+               fbo_formats.erase(free_fbo_num);
+               glDeleteFramebuffers(1, &free_fbo_num);
+               check_error();
        }
        pthread_mutex_unlock(&lock);
 }
@@ -250,7 +350,7 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
        case GL_RG16F:
                bytes_per_pixel = 4;
                break;
-       case GL_LUMINANCE8:
+       case GL_R8:
                bytes_per_pixel = 1;
                break;
        default: