NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vc4: Fix leak of simulator memory on screen cleanup.

Browse source
This commit is contained in:
Eric Anholt 2014-12-13 16:40:54 -08:00
parent f519c3bff1
commit c84306fdc2
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/vc4/vc4_screen.c
View file

@ -30,6 +30,7 @@
#include "util/u_debug.h"
#include "util/u_memory.h"
#include "util/u_format.h"
#include "util/ralloc.h"
#include "vc4_screen.h"
#include "vc4_context.h"
@ -75,7 +76,7 @@ vc4_screen_get_vendor(struct pipe_screen *pscreen)
static void
vc4_screen_destroy(struct pipe_screen *pscreen)
{
free(pscreen);
ralloc_free(pscreen);
}
static int
@ -402,7 +403,7 @@ vc4_screen_is_format_supported(struct pipe_screen *pscreen,
struct pipe_screen *
vc4_screen_create(int fd)
{
struct vc4_screen *screen = CALLOC_STRUCT(vc4_screen);
struct vc4_screen *screen = ralloc(NULL, struct vc4_screen);
struct pipe_screen *pscreen;
pscreen = &screen->base;

4
src/gallium/drivers/vc4/vc4_simulator.c
View file

@ -24,6 +24,7 @@
#ifdef USE_VC4_SIMULATOR
#include "util/u_memory.h"
#include "util/ralloc.h"
#include "vc4_screen.h"
#include "vc4_context.h"
@ -191,7 +192,8 @@ void
vc4_simulator_init(struct vc4_screen *screen)
{
screen->simulator_mem_size = 256 * 1024 * 1024;
screen->simulator_mem_base = malloc(screen->simulator_mem_size);
screen->simulator_mem_base = ralloc_size(screen,
screen->simulator_mem_size);
/* We supply our own memory so that we can have more aperture
* available (256MB instead of simpenrose's default 64MB).