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) {
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()) {
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,