summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/radeon
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-09-01 07:47:24 -0600
committerBrian Paul <[email protected]>2012-09-01 07:47:24 -0600
commitfe72a069d1fcce943f315907b4744b63158938b1 (patch)
treed0c28a670ee8078c9fd5a624cc4a17fb67b72ad1 /src/mesa/drivers/dri/radeon
parent4fdac659f800da0aa4504489f627738c83c94d66 (diff)
mesa: s/FREE/free/
v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_common_context.c6
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_context.c2
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_dma.c16
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_screen.c10
4 files changed, 17 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 8ea8925d8a2..6a56891ba41 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -202,9 +202,9 @@ static void radeon_destroy_atom_list(radeonContextPtr radeon)
struct radeon_state_atom *atom;
foreach(atom, &radeon->hw.atomlist) {
- FREE(atom->cmd);
+ free(atom->cmd);
if (atom->lastcmd)
- FREE(atom->lastcmd);
+ free(atom->lastcmd);
}
}
@@ -267,7 +267,7 @@ void radeonDestroyContext(__DRIcontext *driContextPriv )
fclose(track);
}
#endif
- FREE(radeon);
+ free(radeon);
}
/* Force the context `c' to be unbound from its buffer.
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index ebc0c697003..2b99e36b2a3 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -243,7 +243,7 @@ r100CreateContext( gl_api api,
if (!radeonInitContext(&rmesa->radeon, &functions,
glVisual, driContextPriv,
sharedContextPrivate)) {
- FREE(rmesa);
+ free(rmesa);
*error = __DRI_CTX_ERROR_NO_MEMORY;
return GL_FALSE;
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c
index 61cddda5dc1..2ffbc6df9af 100644
--- a/src/mesa/drivers/dri/radeon/radeon_dma.c
+++ b/src/mesa/drivers/dri/radeon/radeon_dma.c
@@ -302,19 +302,19 @@ void radeonFreeDmaRegions(radeonContextPtr rmesa)
foreach_s(dma_bo, temp, &rmesa->dma.free) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- FREE(dma_bo);
+ free(dma_bo);
}
foreach_s(dma_bo, temp, &rmesa->dma.wait) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- FREE(dma_bo);
+ free(dma_bo);
}
foreach_s(dma_bo, temp, &rmesa->dma.reserved) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- FREE(dma_bo);
+ free(dma_bo);
}
}
@@ -344,7 +344,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
{
struct radeon_dma_bo *dma_bo;
struct radeon_dma_bo *temp;
- const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_FREE_TIME;
+ const int expire_at = ++rmesa->dma.free.expire_counter + DMA_BO_free_TIME;
const int time = rmesa->dma.free.expire_counter;
if (RADEON_DEBUG & RADEON_DMA) {
@@ -371,14 +371,14 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
WARN_ONCE("Leaking dma buffer object!\n");
radeon_bo_unref(dma_bo->bo);
remove_from_list(dma_bo);
- FREE(dma_bo);
+ free(dma_bo);
continue;
}
/* free objects that are too small to be used because of large request */
if (dma_bo->bo->size < rmesa->dma.minimum_size) {
radeon_bo_unref(dma_bo->bo);
remove_from_list(dma_bo);
- FREE(dma_bo);
+ free(dma_bo);
continue;
}
if (!radeon_bo_is_idle(dma_bo->bo)) {
@@ -396,7 +396,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
if (dma_bo->bo->size < rmesa->dma.minimum_size) {
radeon_bo_unref(dma_bo->bo);
remove_from_list(dma_bo);
- FREE(dma_bo);
+ free(dma_bo);
continue;
}
remove_from_list(dma_bo);
@@ -410,7 +410,7 @@ void radeonReleaseDmaRegions(radeonContextPtr rmesa)
break;
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- FREE(dma_bo);
+ free(dma_bo);
}
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8384eb1c912..acd4cc1e2c5 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -251,7 +251,7 @@ radeon_create_image_from_name(__DRIscreen *screen,
0);
if (image->bo == NULL) {
- FREE(image);
+ free(image);
return NULL;
}
@@ -298,7 +298,7 @@ static void
radeon_destroy_image(__DRIimage *image)
{
radeon_bo_unref(image->bo);
- FREE(image);
+ free(image);
}
static __DRIimage *
@@ -351,7 +351,7 @@ radeon_create_image(__DRIscreen *screen,
0);
if (image->bo == NULL) {
- FREE(image);
+ free(image);
return NULL;
}
@@ -507,7 +507,7 @@ radeonCreateScreen2(__DRIscreen *sPriv)
ret = radeonGetParam(sPriv, RADEON_PARAM_DEVICE_ID, &device_id);
if (ret) {
- FREE( screen );
+ free( screen );
fprintf(stderr, "drm_radeon_getparam_t (RADEON_PARAM_DEVICE_ID): %d\n", ret);
return NULL;
}
@@ -561,7 +561,7 @@ radeonDestroyScreen( __DRIscreen *sPriv )
/* free all option information */
driDestroyOptionInfo (&screen->optionCache);
- FREE( screen );
+ free( screen );
sPriv->driverPrivate = NULL;
}