X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=19c26a093f989b5f18d21d626a0ed95c8bbbc7d4;hp=b6f6a3145455e69de69ab43559c21ef15436ae0a;hb=bbbf278f6f2847010a7c41caafa08d36d2099794;hpb=09c983894685554b41f622dadd40ac1a4efc527d

diff --git a/resource_pool.cpp b/resource_pool.cpp
index b6f6a31..19c26a0 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -52,15 +52,29 @@ 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();
+	void *context = get_gl_context_identifier();
+	cleanup_unlinked_fbos(context);
+
+	for (map<void *, std::list<GLuint> >::iterator context_it = fbo_freelist.begin();
+	     context_it != fbo_freelist.end();
+	     ++context_it) {
+		if (context_it->first != context) {
+			// If this does not hold, the client should have called clean_context() earlier.
+			assert(context_it->second.empty());
+			continue;
+		}
+		for (list<GLuint>::const_iterator freelist_it = context_it->second.begin();
+		     freelist_it != context_it->second.end();
+		     ++freelist_it) {
+			pair<void *, GLuint> key(context, *freelist_it);
+			GLuint free_fbo_num = *freelist_it;
+			assert(fbo_formats.count(key) != 0);
+			fbo_formats.erase(key);
+			glDeleteFramebuffers(1, &free_fbo_num);
+			check_error();
+		}
 	}
+
 	assert(fbo_formats.empty());
 }
 
@@ -200,6 +214,12 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 	case GL_SRGB8_ALPHA8:
 		format = GL_RGBA;
 		break;
+	case GL_RGB32F_ARB:
+	case GL_RGB16F_ARB:
+	case GL_RGB8:
+	case GL_SRGB8:
+		format = GL_RGB;
+		break;
 	case GL_RG32F:
 	case GL_RG16F:
 		format = GL_RG;
@@ -248,27 +268,41 @@ void ResourcePool::release_2d_texture(GLuint texture_num)
 		texture_formats.erase(free_texture_num);
 		glDeleteTextures(1, &free_texture_num);
 		check_error();
+
+		// Unlink any lingering FBO related to this texture. We might
+		// not be in the right context, so don't delete it right away;
+		// the cleanup in release_fbo() (which calls cleanup_unlinked_fbos())
+		// will take care of actually doing that later.
+		for (map<pair<void *, GLuint>, FBO>::iterator format_it = fbo_formats.begin();
+		     format_it != fbo_formats.end();
+		     ++format_it) {
+			if (format_it->second.texture_num == free_texture_num) {
+				format_it->second.texture_num = 0;
+			}
+		}
 	}
 	pthread_mutex_unlock(&lock);
 }
 
-GLuint ResourcePool::create_fbo(void *context, GLint internal_format, GLsizei width, GLsizei height)
+GLuint ResourcePool::create_fbo(GLuint texture_num)
 {
+	void *context = get_gl_context_identifier();
+
 	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.internal_format == internal_format &&
-		    format_it->second.width == width &&
-		    format_it->second.height == height) {
-			fbo_freelist.erase(freelist_it);
-			pthread_mutex_unlock(&lock);
-			return fbo_num;
+	if (fbo_freelist.count(context) != 0) {
+		// See if there's an FBO on the freelist we can use.
+		for (list<GLuint>::iterator freelist_it = fbo_freelist[context].begin();
+		     freelist_it != fbo_freelist[context].end();
+		     ++freelist_it) {
+			GLuint fbo_num = *freelist_it;
+			map<pair<void *, GLuint>, FBO>::const_iterator format_it =
+				fbo_formats.find(make_pair(context, fbo_num));
+			assert(format_it != fbo_formats.end());
+			if (format_it->second.texture_num == texture_num) {
+				fbo_freelist[context].erase(freelist_it);
+				pthread_mutex_unlock(&lock);
+				return fbo_num;
+			}
 		}
 	}
 
@@ -276,14 +310,25 @@ GLuint ResourcePool::create_fbo(void *context, GLint internal_format, GLsizei wi
 	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.internal_format = internal_format;
-	fbo_format.width = width;
-	fbo_format.height = height;
-	assert(fbo_formats.count(fbo_num) == 0);
-	fbo_formats.insert(make_pair(fbo_num, fbo_format));
+	fbo_format.texture_num = texture_num;
+	pair<void *, GLuint> key(context, fbo_num);
+	assert(fbo_formats.count(key) == 0);
+	fbo_formats.insert(make_pair(key, fbo_format));
 
 	pthread_mutex_unlock(&lock);
 	return fbo_num;
@@ -291,19 +336,58 @@ GLuint ResourcePool::create_fbo(void *context, GLint internal_format, GLsizei wi
 
 void ResourcePool::release_fbo(GLuint fbo_num)
 {
+	void *context = get_gl_context_identifier();
+
 	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);
+	fbo_freelist[context].push_front(fbo_num);
+	assert(fbo_formats.count(make_pair(context, fbo_num)) != 0);
+
+	// Now that we're in this context, free up any FBOs that are connected
+	// to deleted textures (in release_2d_texture).
+	cleanup_unlinked_fbos(context);
+
+	shrink_fbo_freelist(context, fbo_freelist_max_length);
+	pthread_mutex_unlock(&lock);
+}
+
+void ResourcePool::clean_context()
+{
+	void *context = get_gl_context_identifier();
+
+	// Currently, we only need to worry about FBOs, as they are the only
+	// non-shareable resource we hold.
+	shrink_fbo_freelist(context, 0);
+	fbo_freelist.erase(context);
+}
+
+void ResourcePool::cleanup_unlinked_fbos(void *context)
+{
+	for (list<GLuint>::iterator freelist_it = fbo_freelist[context].begin();
+	     freelist_it != fbo_freelist[context].end(); ) {
+		GLuint fbo_num = *freelist_it;
+		pair<void *, GLuint> key(context, fbo_num);
+		assert(fbo_formats.count(key) != 0);
+		if (fbo_formats[key].texture_num == 0) {
+			glDeleteFramebuffers(1, &fbo_num);
+			check_error();
+			fbo_freelist[context].erase(freelist_it++);
+		} else {
+			freelist_it++;
+		}
+	}
+}
+
+void ResourcePool::shrink_fbo_freelist(void *context, size_t max_length)
+{
+	while (fbo_freelist[context].size() > max_length) {
+		GLuint free_fbo_num = fbo_freelist[context].back();
+		pair<void *, GLuint> key(context, free_fbo_num);
+		fbo_freelist[context].pop_back();
+		assert(fbo_formats.count(key) != 0);
+		fbo_formats.erase(key);
 		glDeleteFramebuffers(1, &free_fbo_num);
 		check_error();
 	}
-	pthread_mutex_unlock(&lock);
 }
 
 size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
@@ -321,6 +405,16 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 	case GL_SRGB8_ALPHA8:
 		bytes_per_pixel = 4;
 		break;
+	case GL_RGB32F_ARB:
+		bytes_per_pixel = 12;
+		break;
+	case GL_RGB16F_ARB:
+		bytes_per_pixel = 6;
+		break;
+	case GL_RGB8:
+	case GL_SRGB8:
+		bytes_per_pixel = 3;
+		break;
 	case GL_RG32F:
 		bytes_per_pixel = 8;
 		break;