Skip to content

Fix shader uniform memory leaks #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 18, 2020
Merged

Fix shader uniform memory leaks #317

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd1a3f8
Fix shader uniform memory leaks
postcasio Nov 17, 2020
539b69c
Fix code style
postcasio Nov 17, 2020
cac34f5
Fix missing empty line before iterator
postcasio Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/minisphere/galileo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,27 @@ shader_ref(shader_t* it)
void
shader_unref(shader_t* it)
{
struct uniform *uniform;
iter_t iter;

if (it == NULL || --it->refcount > 0)
return;

console_log(3, "disposing shader program #%u no longer in use", it->id);

iter = vector_enum(it->uniforms);
while ((uniform = iter_next(&iter))) {
switch (uniform->type)
{
case UNIFORM_FLOAT_ARR:
free(uniform->float_list);
break;
case UNIFORM_INT_ARR:
free(uniform->int_list);
break;
}
}

al_destroy_shader(it->program);
vector_free(it->uniforms);
free(it);
Expand Down Expand Up @@ -831,8 +848,18 @@ free_cached_uniform(shader_t* shader, const char* name)

iter = vector_enum(shader->uniforms);
while ((uniform = iter_next(&iter))) {
if (strcmp(uniform->name, name) == 0)
if (strcmp(uniform->name, name) == 0) {
switch (uniform->type) {
case UNIFORM_FLOAT_ARR:
free(uniform->float_list);
break;
case UNIFORM_INT_ARR:
free(uniform->int_list);
break;
}

iter_remove(&iter);
}
}
}

Expand Down