X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=10eeb9bb491f54ed5d8b9ee32c30719c18bf18c1;hp=81a6bd4afc7f1f09f8083d9eef02e2ec8e5c679d;hb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1;hpb=9651a4eaae012cdc49c1aa38197861e04f62e91e diff --git a/resource_pool.cpp b/resource_pool.cpp index 81a6bd4..10eeb9b 100644 --- a/resource_pool.cpp +++ b/resource_pool.cpp @@ -6,19 +6,24 @@ #include #include #include +#include -#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); } @@ -46,6 +51,17 @@ ResourcePool::~ResourcePool() } assert(texture_formats.empty()); assert(texture_freelist_bytes == 0); + + for (list::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) @@ -103,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; @@ -175,24 +200,58 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs case GL_SRGB8_ALPHA8: format = GL_RGBA; break; + case GL_RGB32F: + case GL_RGB16F: + case GL_RGB8: + format = GL_RGB; + break; case GL_RG32F: case GL_RG16F: + case GL_RG8: format = GL_RG; break; - case GL_LUMINANCE8: - format = GL_LUMINANCE; + case GL_R32F: + case GL_R16F: + case GL_R8: + format = GL_RED; break; default: // TODO: Add more here as needed. assert(false); } + // Same with type; GLES is stricter than desktop OpenGL here. + GLenum type; + switch (internal_format) { + case GL_RGBA32F_ARB: + case GL_RGBA16F_ARB: + case GL_RGB32F: + case GL_RGB16F: + case GL_RG32F: + case GL_RG16F: + case GL_R32F: + case GL_R16F: + type = GL_FLOAT; + break; + case GL_SRGB8_ALPHA8: + case GL_RGBA8: + case GL_RGB8: + case GL_RG8: + case GL_R8: + type = GL_UNSIGNED_BYTE; + break; + default: + // TODO: Add more here as needed. + assert(false); + } + + GLuint texture_num; glGenTextures(1, &texture_num); check_error(); glBindTexture(GL_TEXTURE_2D, texture_num); check_error(); - glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, NULL); check_error(); glBindTexture(GL_TEXTURE_2D, 0); check_error(); @@ -223,6 +282,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::iterator fbo_freelist_it = fbo_freelist.begin(); + fbo_freelist_it != fbo_freelist.end(); ) { + GLuint fbo_num = *fbo_freelist_it; + map::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::iterator freelist_it = fbo_freelist.begin(); + freelist_it != fbo_freelist.end(); + ++freelist_it) { + GLuint fbo_num = *freelist_it; + map::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); } @@ -238,17 +374,33 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format) case GL_RGBA16F_ARB: bytes_per_pixel = 8; break; + case GL_RGB32F_ARB: + bytes_per_pixel = 12; + break; + case GL_RGB16F_ARB: + bytes_per_pixel = 6; + break; case GL_RGBA8: case GL_SRGB8_ALPHA8: bytes_per_pixel = 4; break; + case GL_RGB8: + case GL_SRGB8: + bytes_per_pixel = 3; + break; case GL_RG32F: bytes_per_pixel = 8; break; case GL_RG16F: bytes_per_pixel = 4; break; - case GL_LUMINANCE8: + case GL_R32F: + bytes_per_pixel = 4; + break; + case GL_R16F: + bytes_per_pixel = 2; + break; + case GL_R8: bytes_per_pixel = 1; break; default: @@ -258,3 +410,5 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format) return texture_format.width * texture_format.height * bytes_per_pixel; } + +} // namespace movit