X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=72b309519062b728d7b1b6ae73d05c0cc5086c9d;hp=bfd53061f2309a41285bcc81252e88418b6dd209;hb=968ceb4cc1714e745b3f6425b57611864823f444;hpb=ecab6f3b08bc0a995dd96542758031f1ba2c6a27 diff --git a/resource_pool.cpp b/resource_pool.cpp index bfd5306..72b3095 100644 --- a/resource_pool.cpp +++ b/resource_pool.cpp @@ -1,20 +1,26 @@ -#include "resource_pool.h" - -#include +#include #include - +#include +#include #include #include #include #include +#include "glew.h" #include "init.h" +#include "resource_pool.h" #include "util.h" using namespace std; -ResourcePool::ResourcePool(size_t program_freelist_max_length) - : program_freelist_max_length(program_freelist_max_length) { +namespace movit { + +ResourcePool::ResourcePool(size_t program_freelist_max_length, + size_t texture_freelist_max_bytes) + : program_freelist_max_length(program_freelist_max_length), + texture_freelist_max_bytes(texture_freelist_max_bytes), + texture_freelist_bytes(0) { pthread_mutex_init(&lock, NULL); } @@ -29,12 +35,25 @@ ResourcePool::~ResourcePool() } assert(programs.empty()); assert(program_shaders.empty()); + + for (list::const_iterator freelist_it = texture_freelist.begin(); + freelist_it != texture_freelist.end(); + ++freelist_it) { + GLuint free_texture_num = *freelist_it; + assert(texture_formats.count(free_texture_num) != 0); + texture_freelist_bytes -= estimate_texture_size(texture_formats[free_texture_num]); + texture_formats.erase(free_texture_num); + glDeleteTextures(1, &free_texture_num); + check_error(); + } + assert(texture_formats.empty()); + assert(texture_freelist_bytes == 0); } void ResourcePool::delete_program(GLuint glsl_program_num) { bool found_program = false; - for (std::map, GLuint>::iterator program_it = programs.begin(); + for (map, GLuint>::iterator program_it = programs.begin(); program_it != programs.end(); ++program_it) { if (program_it->second == glsl_program_num) { @@ -46,7 +65,7 @@ void ResourcePool::delete_program(GLuint glsl_program_num) assert(found_program); glDeleteProgram(glsl_program_num); - std::map >::iterator shader_it = + map >::iterator shader_it = program_shaders.find(glsl_program_num); assert(shader_it != program_shaders.end()); @@ -86,6 +105,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; @@ -130,6 +158,24 @@ void ResourcePool::release_glsl_program(GLuint glsl_program_num) GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLsizei height) { + pthread_mutex_lock(&lock); + // See if there's a texture on the freelist we can use. + for (list::iterator freelist_it = texture_freelist.begin(); + freelist_it != texture_freelist.end(); + ++freelist_it) { + GLuint texture_num = *freelist_it; + map::const_iterator format_it = texture_formats.find(texture_num); + assert(format_it != texture_formats.end()); + if (format_it->second.internal_format == internal_format && + format_it->second.width == width && + format_it->second.height == height) { + texture_freelist_bytes -= estimate_texture_size(format_it->second); + texture_freelist.erase(freelist_it); + pthread_mutex_unlock(&lock); + return texture_num; + } + } + // Find any reasonable format given the internal format; OpenGL validates it // even though we give NULL as pointer. GLenum format; @@ -144,6 +190,9 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs case GL_RG16F: format = GL_RG; break; + case GL_R8: + format = GL_RED; + break; default: // TODO: Add more here as needed. assert(false); @@ -159,11 +208,66 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs glBindTexture(GL_TEXTURE_2D, 0); check_error(); + Texture2D texture_format; + texture_format.internal_format = internal_format; + texture_format.width = width; + texture_format.height = height; + assert(texture_formats.count(texture_num) == 0); + texture_formats.insert(make_pair(texture_num, texture_format)); + + pthread_mutex_unlock(&lock); return texture_num; } void ResourcePool::release_2d_texture(GLuint texture_num) { - glDeleteTextures(1, &texture_num); - check_error(); + pthread_mutex_lock(&lock); + texture_freelist.push_front(texture_num); + assert(texture_formats.count(texture_num) != 0); + texture_freelist_bytes += estimate_texture_size(texture_formats[texture_num]); + + while (texture_freelist_bytes > texture_freelist_max_bytes) { + GLuint free_texture_num = texture_freelist.front(); + texture_freelist.pop_front(); + assert(texture_formats.count(free_texture_num) != 0); + texture_freelist_bytes -= estimate_texture_size(texture_formats[free_texture_num]); + texture_formats.erase(free_texture_num); + glDeleteTextures(1, &free_texture_num); + check_error(); + } + pthread_mutex_unlock(&lock); +} + +size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format) +{ + size_t bytes_per_pixel; + + switch (texture_format.internal_format) { + case GL_RGBA32F_ARB: + bytes_per_pixel = 16; + break; + case GL_RGBA16F_ARB: + bytes_per_pixel = 8; + break; + case GL_RGBA8: + case GL_SRGB8_ALPHA8: + bytes_per_pixel = 4; + break; + case GL_RG32F: + bytes_per_pixel = 8; + break; + case GL_RG16F: + bytes_per_pixel = 4; + break; + case GL_R8: + bytes_per_pixel = 1; + break; + default: + // TODO: Add more here as needed. + assert(false); + } + + return texture_format.width * texture_format.height * bytes_per_pixel; } + +} // namespace movit