diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-03-17 13:57:14 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-03-18 10:31:12 -0700 |
| commit | b3e4b769dd318936abc38acbbbdec61ae2539e84 (patch) | |
| tree | 9557fb9aa8f8c6cbaf9f2f031c659555834bdede | |
| parent | 41097db91bb18cfb03faf00d9bc7a5495d1bf66e (diff) | |
| download | external_mesa3d-b3e4b769dd318936abc38acbbbdec61ae2539e84.zip external_mesa3d-b3e4b769dd318936abc38acbbbdec61ae2539e84.tar.gz external_mesa3d-b3e4b769dd318936abc38acbbbdec61ae2539e84.tar.bz2 | |
i965: Allocate the screen using ralloc rather than calloc.
This will allow us to use the screen as a memory context.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 464cebf..3536922 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -37,6 +37,7 @@ #include "main/fbobject.h" #include "main/version.h" #include "swrast/s_renderbuffer.h" +#include "glsl/ralloc.h" #include "utils.h" #include "xmlpool.h" @@ -946,7 +947,7 @@ intelDestroyScreen(__DRIscreen * sPriv) dri_bufmgr_destroy(intelScreen->bufmgr); driDestroyOptionInfo(&intelScreen->optionCache); - free(intelScreen); + ralloc_free(intelScreen); sPriv->driverPrivate = NULL; } @@ -1311,7 +1312,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) } /* Allocate the private area */ - intelScreen = calloc(1, sizeof *intelScreen); + intelScreen = rzalloc(NULL, struct intel_screen); if (!intelScreen) { fprintf(stderr, "\nERROR! Allocating private area failed\n"); return false; |