fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 10:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: fix sampler_view REALLOC/FREE macro mix-up

Browse source 
We were using REALLOC() from u_memory.h but FREE() from imports.h.
This mismatch caused us to trash the heap on Windows after we
deleted a texture object.

This fixes a regression from commit 6c59be7776.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
This commit is contained in:
Brian Paul 2014-04-09 19:22:11 -06:00
parent 87502bbcd7
commit f9985db0bc
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/state_tracker/st_cb_texture.c
View file

@ -155,7 +155,7 @@ st_DeleteTextureObject(struct gl_context *ctx,
pipe_resource_reference(&stObj->pt, NULL);
st_texture_release_all_sampler_views(stObj);
FREE(stObj->sampler_views);
st_texture_free_sampler_views(stObj);
_mesa_delete_texture_object(ctx, texObj);
}

12
src/mesa/state_tracker/st_texture.c
View file

@ -483,3 +483,15 @@ st_texture_release_all_sampler_views(struct st_texture_object *stObj)
for (i = 0; i < stObj->num_sampler_views; ++i)
pipe_sampler_view_reference(&stObj->sampler_views[i], NULL);
}
void
st_texture_free_sampler_views(struct st_texture_object *stObj)
{
/* NOTE:
* We use FREE() here to match REALLOC() above. Both come from
* u_memory.h, not imports.h. If we mis-match MALLOC/FREE from
* those two headers we can trash the heap.
*/
FREE(stObj->sampler_views);
}

3
src/mesa/state_tracker/st_texture.h
View file

@ -241,4 +241,7 @@ st_texture_release_sampler_view(struct st_context *st,
extern void
st_texture_release_all_sampler_views(struct st_texture_object *stObj);
void
st_texture_free_sampler_views(struct st_texture_object *stObj);
#endif