X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=6939fe01d50a61131d4357858c6d82a4d9361da2;hp=240c3b2c58b332d3b2a02b7fbff8cde5bfe206b2;hb=34776d3ed2565ee834405e575bf3bfc7f7933e36;hpb=e90eb349c71419e874f34f1ab122f57bebeacda7 diff --git a/resource_pool.cpp b/resource_pool.cpp index 240c3b2..6939fe0 100644 --- a/resource_pool.cpp +++ b/resource_pool.cpp @@ -55,7 +55,7 @@ ResourcePool::~ResourcePool() void *context = get_gl_context_identifier(); cleanup_unlinked_fbos(context); - for (map >::iterator context_it = fbo_freelist.begin(); + for (map >::iterator context_it = fbo_freelist.begin(); context_it != fbo_freelist.end(); ++context_it) { if (context_it->first != context) { @@ -63,15 +63,13 @@ ResourcePool::~ResourcePool() assert(context_it->second.empty()); continue; } - for (list::const_iterator freelist_it = context_it->second.begin(); + for (list::const_iterator freelist_it = context_it->second.begin(); freelist_it != context_it->second.end(); ++freelist_it) { - pair 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); + FBOFormatIterator fbo_it = *freelist_it; + glDeleteFramebuffers(1, &fbo_it->second.fbo_num); check_error(); + fbo_formats.erase(fbo_it); } } @@ -102,11 +100,23 @@ void ResourcePool::delete_program(GLuint glsl_program_num) program_shaders.erase(shader_it); } -GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const string& fragment_shader) +GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, + const string& fragment_shader, + const vector& fragment_shader_outputs) { GLuint glsl_program_num; pthread_mutex_lock(&lock); - const pair key(vertex_shader, fragment_shader); + + // Augment the fragment shader program text with the outputs, so that they become + // part of the key. Also potentially useful for debugging. + string fragment_shader_processed = fragment_shader; + for (unsigned output_index = 0; output_index < fragment_shader_outputs.size(); ++output_index) { + char buf[256]; + snprintf(buf, sizeof(buf), "// Bound output: %s\n", fragment_shader_outputs[output_index].c_str()); + fragment_shader_processed += buf; + } + + const pair key(vertex_shader, fragment_shader_processed); if (programs.count(key)) { // Already in the cache. Increment the refcount, or take it off the freelist // if it's zero. @@ -127,12 +137,21 @@ GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const str check_error(); GLuint vs_obj = compile_shader(vertex_shader, GL_VERTEX_SHADER); check_error(); - GLuint fs_obj = compile_shader(fragment_shader, GL_FRAGMENT_SHADER); + GLuint fs_obj = compile_shader(fragment_shader_processed, GL_FRAGMENT_SHADER); check_error(); glAttachShader(glsl_program_num, vs_obj); check_error(); glAttachShader(glsl_program_num, fs_obj); check_error(); + + // Bind the outputs, if we have multiple ones. + if (fragment_shader_outputs.size() > 1) { + for (unsigned output_index = 0; output_index < fragment_shader_outputs.size(); ++output_index) { + glBindFragDataLocation(glsl_program_num, output_index, + fragment_shader_outputs[output_index].c_str()); + } + } + glLinkProgram(glsl_program_num); check_error(); @@ -155,7 +174,7 @@ GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const str perror(filename); exit(1); } - fprintf(fp, "%s\n", fragment_shader.c_str()); + fprintf(fp, "%s\n", fragment_shader_processed.c_str()); fclose(fp); } @@ -217,14 +236,18 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs case GL_RGBA32F_ARB: case GL_RGBA16F_ARB: case GL_RGBA8: + case GL_RGB10_A2: case GL_SRGB8_ALPHA8: format = GL_RGBA; break; case GL_RGB32F: case GL_RGB16F: + case GL_R11F_G11F_B10F: case GL_RGB8: + case GL_RGB10: case GL_SRGB8: case GL_RGB565: + case GL_RGB9_E5: format = GL_RGB; break; case GL_RG32F: @@ -249,6 +272,8 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs case GL_RGBA16F_ARB: case GL_RGB32F: case GL_RGB16F: + case GL_R11F_G11F_B10F: + case GL_RGB9_E5: case GL_RG32F: case GL_RG16F: case GL_R32F: @@ -259,6 +284,8 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs case GL_SRGB8: case GL_RGBA8: case GL_RGB8: + case GL_RGB10_A2: + case GL_RGB10: case GL_RG8: case GL_R8: type = GL_UNSIGNED_BYTE; @@ -342,20 +369,17 @@ GLuint ResourcePool::create_fbo(GLuint texture0_num, GLuint texture1_num, GLuint pthread_mutex_lock(&lock); if (fbo_freelist.count(context) != 0) { // See if there's an FBO on the freelist we can use. - for (list::iterator freelist_it = fbo_freelist[context].begin(); - freelist_it != fbo_freelist[context].end(); - ++freelist_it) { - GLuint fbo_num = *freelist_it; - map, 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[0] == texture0_num && - format_it->second.texture_num[1] == texture1_num && - format_it->second.texture_num[2] == texture2_num && - format_it->second.texture_num[3] == texture3_num) { + list::iterator end = fbo_freelist[context].end(); + for (list::iterator freelist_it = fbo_freelist[context].begin(); + freelist_it != end; ++freelist_it) { + FBOFormatIterator fbo_it = *freelist_it; + if (fbo_it->second.texture_num[0] == texture0_num && + fbo_it->second.texture_num[1] == texture1_num && + fbo_it->second.texture_num[2] == texture2_num && + fbo_it->second.texture_num[3] == texture3_num) { fbo_freelist[context].erase(freelist_it); pthread_mutex_unlock(&lock); - return fbo_num; + return fbo_it->second.fbo_num; } } } @@ -367,10 +391,9 @@ GLuint ResourcePool::create_fbo(GLuint texture0_num, GLuint texture1_num, GLuint fbo_format.texture_num[2] = texture2_num; fbo_format.texture_num[3] = texture3_num; - GLuint fbo_num; - glGenFramebuffers(1, &fbo_num); + glGenFramebuffers(1, &fbo_format.fbo_num); check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, fbo_num); + glBindFramebuffer(GL_FRAMEBUFFER, fbo_format.fbo_num); check_error(); GLenum bufs[num_fbo_attachments]; @@ -397,12 +420,12 @@ GLuint ResourcePool::create_fbo(GLuint texture0_num, GLuint texture1_num, GLuint glBindFramebuffer(GL_FRAMEBUFFER, 0); check_error(); - pair key(context, fbo_num); + pair key(context, fbo_format.fbo_num); assert(fbo_formats.count(key) == 0); fbo_formats.insert(make_pair(key, fbo_format)); pthread_mutex_unlock(&lock); - return fbo_num; + return fbo_format.fbo_num; } void ResourcePool::release_fbo(GLuint fbo_num) @@ -410,8 +433,9 @@ void ResourcePool::release_fbo(GLuint fbo_num) void *context = get_gl_context_identifier(); pthread_mutex_lock(&lock); - fbo_freelist[context].push_front(fbo_num); - assert(fbo_formats.count(make_pair(context, fbo_num)) != 0); + FBOFormatIterator fbo_it = fbo_formats.find(make_pair(context, fbo_num)); + assert(fbo_it != fbo_formats.end()); + fbo_freelist[context].push_front(fbo_it); // Now that we're in this context, free up any FBOs that are connected // to deleted textures (in release_2d_texture). @@ -433,24 +457,22 @@ void ResourcePool::clean_context() void ResourcePool::cleanup_unlinked_fbos(void *context) { - for (list::iterator freelist_it = fbo_freelist[context].begin(); - freelist_it != fbo_freelist[context].end(); ) { - GLuint fbo_num = *freelist_it; - pair key(context, fbo_num); - assert(fbo_formats.count(key) != 0); + list::iterator end = fbo_freelist[context].end(); + for (list::iterator freelist_it = fbo_freelist[context].begin(); freelist_it != end; ) { + FBOFormatIterator fbo_it = *freelist_it; bool all_unlinked = true; for (unsigned i = 0; i < num_fbo_attachments; ++i) { - if (fbo_formats[key].texture_num[i] != 0 && - fbo_formats[key].texture_num[i] != GL_INVALID_INDEX) { + if (fbo_it->second.texture_num[i] != 0 && + fbo_it->second.texture_num[i] != GL_INVALID_INDEX) { all_unlinked = false; break; } } if (all_unlinked) { - fbo_formats.erase(key); - glDeleteFramebuffers(1, &fbo_num); + glDeleteFramebuffers(1, &fbo_it->second.fbo_num); check_error(); + fbo_formats.erase(fbo_it); fbo_freelist[context].erase(freelist_it++); } else { freelist_it++; @@ -460,14 +482,13 @@ void ResourcePool::cleanup_unlinked_fbos(void *context) 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 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); + list &freelist = fbo_freelist[context]; + while (freelist.size() > max_length) { + FBOFormatIterator free_fbo_it = freelist.back(); + glDeleteFramebuffers(1, &free_fbo_it->second.fbo_num); check_error(); + fbo_formats.erase(free_fbo_it); + freelist.pop_back(); } } @@ -488,8 +509,16 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format) case GL_RGB16F_ARB: bytes_per_pixel = 6; break; + case GL_R11F_G11F_B10F: + bytes_per_pixel = 4; + break; + case GL_RGB9_E5: + bytes_per_pixel = 4; + break; case GL_RGBA8: case GL_SRGB8_ALPHA8: + case GL_RGB10_A2: + case GL_RGB10: bytes_per_pixel = 4; break; case GL_RGB8: