Mesa (master): i965: Allocate the screen using ralloc rather than calloc.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Mar 18 17:36:10 UTC 2014
Module: Mesa
Branch: master
Commit: b3e4b769dd318936abc38acbbbdec61ae2539e84
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3e4b769dd318936abc38acbbbdec61ae2539e84
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Mar 17 13:57:14 2014 -0700
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 at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/drivers/dri/i965/intel_screen.c | 5 +++--
1 file 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;
More information about the mesa-commit
mailing list