Fix deletion of compute shaders.

[movit] / resource_pool.cpp

diff --git a/resource_pool.cpp b/resource_pool.cpp
index b9adda7c337221ebbfc7764e9a93b69192e1ac95..2cf470fcb7b950ea3a3a1ff8525a07b430a8765a 100644 (file)
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -26,7 +26,7 @@ ResourcePool::ResourcePool(size_t program_freelist_max_length,
          vao_freelist_max_length(vao_freelist_max_length),
          texture_freelist_bytes(0)
 {
-       pthread_mutex_init(&lock, NULL);
+       pthread_mutex_init(&lock, nullptr);
 }
 
 ResourcePool::~ResourcePool()
@@ -57,7 +57,7 @@ ResourcePool::~ResourcePool()
        void *context = get_gl_context_identifier();
        cleanup_unlinked_fbos(context);
 
-       for (map<void *, std::list<FBOFormatIterator> >::iterator context_it = fbo_freelist.begin();
+       for (map<void *, std::list<FBOFormatIterator>>::iterator context_it = fbo_freelist.begin();
             context_it != fbo_freelist.end();
             ++context_it) {
                if (context_it->first != context) {
@@ -90,9 +90,18 @@ void ResourcePool::delete_program(GLuint glsl_program_num)
                        break;
                }
        }
+       for (map<string, GLuint>::iterator program_it = compute_programs.begin();
+            program_it != compute_programs.end();
+            ++program_it) {
+               if (program_it->second == glsl_program_num) {
+                       compute_programs.erase(program_it);
+                       found_program = true;
+                       break;
+               }
+       }
        assert(found_program);
 
-       map<GLuint, stack<GLuint> >::iterator instance_list_it = program_instances.find(glsl_program_num);
+       map<GLuint, stack<GLuint>>::iterator instance_list_it = program_instances.find(glsl_program_num);
        assert(instance_list_it != program_instances.end());
 
        while (!instance_list_it->second.empty()) {
@@ -105,11 +114,19 @@ void ResourcePool::delete_program(GLuint glsl_program_num)
 
        map<GLuint, ShaderSpec>::iterator shader_it =
                program_shaders.find(glsl_program_num);
-       assert(shader_it != program_shaders.end());
-
-       glDeleteShader(shader_it->second.vs_obj);
-       glDeleteShader(shader_it->second.fs_obj);
-       program_shaders.erase(shader_it);
+       if (shader_it == program_shaders.end()) {
+               // Should be a compute shader.
+               map<GLuint, ComputeShaderSpec>::iterator compute_shader_it =
+                       compute_program_shaders.find(glsl_program_num);
+               assert(compute_shader_it != compute_program_shaders.end());
+
+               glDeleteShader(compute_shader_it->second.cs_obj);
+               compute_program_shaders.erase(compute_shader_it);
+       } else {
+               glDeleteShader(shader_it->second.vs_obj);
+               glDeleteShader(shader_it->second.fs_obj);
+               program_shaders.erase(shader_it);
+       }
 }
 
 GLuint ResourcePool::compile_glsl_program(const string& vertex_shader,
@@ -182,7 +199,7 @@ GLuint ResourcePool::link_program(GLuint vs_obj,
        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);
+               glGetProgramInfoLog(glsl_program_num, 1024, nullptr, error_log);
                fprintf(stderr, "Error linking program: %s\n", error_log);
                exit(1);
        }
@@ -252,7 +269,7 @@ GLuint ResourcePool::link_compute_program(GLuint cs_obj)
        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);
+               glGetProgramInfoLog(glsl_program_num, 1024, nullptr, error_log);
                fprintf(stderr, "Error linking program: %s\n", error_log);
                exit(1);
        }
@@ -336,7 +353,7 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
        }
 
        // Find any reasonable format given the internal format; OpenGL validates it
-       // even though we give NULL as pointer.
+       // even though we give nullptr as pointer.
        GLenum format;
        switch (internal_format) {
        case GL_RGBA32F_ARB:
@@ -420,7 +437,7 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
        check_error();
        glBindTexture(GL_TEXTURE_2D, texture_num);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, nullptr);
        check_error();
        glBindTexture(GL_TEXTURE_2D, 0);
        check_error();
@@ -710,7 +727,7 @@ void ResourcePool::output_debug_shader(const string &shader_src, const string &s
                char filename[256];
                sprintf(filename, "chain-%03d.%s", compiled_shader_num++, suffix.c_str());
                FILE *fp = fopen(filename, "w");
-               if (fp == NULL) {
+               if (fp == nullptr) {
                        perror(filename);
                        exit(1);
                }