X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=resource_pool.cpp;h=a32247de63461a23f00e4585ded05aa5628a0de7;hb=60e4852ff1b04c525a9e3f1c98a1017db28b27bd;hp=b074247e8d772bc6f4b00bbb817f1363e15baaf0;hpb=85f9719bf3519b1f1942738d11601584f5d38725;p=movit

diff --git a/resource_pool.cpp b/resource_pool.cpp
index b074247..a32247d 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -1,23 +1,29 @@
-#include "resource_pool.h"
-
-#include <stdio.h>
+#include <assert.h>
 #include <pthread.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
 
+#include "glew.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "util.h"
 
 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);
 }
 
@@ -45,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)
@@ -102,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;
@@ -178,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.
@@ -222,6 +248,84 @@ 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) {
+				fbo_formats.erase(fbo_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);
 }
@@ -247,7 +351,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:
@@ -257,3 +361,5 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 
 	return texture_format.width * texture_format.height * bytes_per_pixel;
 }
+
+}  // namespace movit