diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-19 13:16:57 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-19 13:30:22 -0500 |
| commit | 99ae9e8d7d57ae37629754edd5b1e3716611827f (patch) | |
| tree | 1503daf41e7a1f1050401cec46dbffd10e697cf2 /src/mesa/drivers/dri/i810 | |
| parent | 3ef51b4bd98648f3141b3c6978db312f2f6c782e (diff) | |
Drop macro wrappers for the aligned memory functions
Diffstat (limited to 'src/mesa/drivers/dri/i810')
| -rw-r--r-- | src/mesa/drivers/dri/i810/i810screen.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i810/i810vb.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c index 1c4deef319..56708c97cb 100644 --- a/src/mesa/drivers/dri/i810/i810screen.c +++ b/src/mesa/drivers/dri/i810/i810screen.c @@ -131,12 +131,12 @@ static drmBufMapPtr i810_create_empty_buffers(void) { drmBufMapPtr retval; - retval = (drmBufMapPtr)ALIGN_MALLOC(sizeof(drmBufMap), 32); + retval = (drmBufMapPtr)_mesa_align_malloc(sizeof(drmBufMap), 32); if(retval == NULL) return NULL; memset(retval, 0, sizeof(drmBufMap)); - retval->list = (drmBufPtr)ALIGN_MALLOC(sizeof(drmBuf) * I810_DMA_BUF_NR, 32); + retval->list = (drmBufPtr)_mesa_align_malloc(sizeof(drmBuf) * I810_DMA_BUF_NR, 32); if(retval->list == NULL) { - ALIGN_FREE(retval); + _mesa_align_free(retval); return NULL; } memset(retval->list, 0, sizeof(drmBuf) * I810_DMA_BUF_NR); diff --git a/src/mesa/drivers/dri/i810/i810vb.c b/src/mesa/drivers/dri/i810/i810vb.c index 09a772258c..70301a2d2e 100644 --- a/src/mesa/drivers/dri/i810/i810vb.c +++ b/src/mesa/drivers/dri/i810/i810vb.c @@ -464,7 +464,7 @@ void i810InitVB( GLcontext *ctx ) i810ContextPtr imesa = I810_CONTEXT(ctx); GLuint size = TNL_CONTEXT(ctx)->vb.Size; - imesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32); + imesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32); { static int firsttime = 1; @@ -480,7 +480,7 @@ void i810FreeVB( GLcontext *ctx ) { i810ContextPtr imesa = I810_CONTEXT(ctx); if (imesa->verts) { - ALIGN_FREE(imesa->verts); + _mesa_align_free(imesa->verts); imesa->verts = 0; } } |