summaryrefslogtreecommitdiff
path: root/src/radeon_vbo.c
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-06-14 08:52:16 +0200
committerMichel Dänzer <michel@daenzer.net>2010-06-21 08:18:15 +0200
commitf7a91ece264af9f3fd2fc18e99aefcda93ce9f5c (patch)
treedd5748ed2b94a860be6e66070e2c025cc9febad0 /src/radeon_vbo.c
parentea37d24b1b6d4cbcf73e680846de25b72af216e3 (diff)
Convert x(c)alloc/xfree to m/calloc/free.
Fixes deprecation warnings with xserver master and should also work with older xservers.
Diffstat (limited to 'src/radeon_vbo.c')
-rw-r--r--src/radeon_vbo.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/radeon_vbo.c b/src/radeon_vbo.c
index ad650b2d..0735540d 100644
--- a/src/radeon_vbo.c
+++ b/src/radeon_vbo.c
@@ -97,19 +97,19 @@ void radeon_vbo_free_lists(ScrnInfoPtr pScrn)
foreach_s(dma_bo, temp, &accel_state->bo_free) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- xfree(dma_bo);
+ free(dma_bo);
}
foreach_s(dma_bo, temp, &accel_state->bo_wait) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- xfree(dma_bo);
+ free(dma_bo);
}
foreach_s(dma_bo, temp, &accel_state->bo_reserved) {
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- xfree(dma_bo);
+ free(dma_bo);
}
}
@@ -126,7 +126,7 @@ void radeon_vbo_flush_bos(ScrnInfoPtr pScrn)
ErrorF("leaking dma buffer\n");
while ((dma_bo->bo = radeon_bo_unref(dma_bo->bo))) {}
remove_from_list(dma_bo);
- xfree(dma_bo);
+ free(dma_bo);
continue;
}
@@ -157,7 +157,7 @@ void radeon_vbo_flush_bos(ScrnInfoPtr pScrn)
remove_from_list(dma_bo);
radeon_bo_unref(dma_bo->bo);
- xfree(dma_bo);
+ free(dma_bo);
}
}
@@ -169,7 +169,7 @@ static struct radeon_bo *radeon_vbo_get_bo(ScrnInfoPtr pScrn)
struct radeon_bo *bo;
if (is_empty_list(&accel_state->bo_free)) {
- dma_bo = xcalloc(1, sizeof(struct radeon_dma_bo));
+ dma_bo = calloc(1, sizeof(struct radeon_dma_bo));
if (!dma_bo)
return NULL;