Drop macro wrappers for the aligned memory functions

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_vb.c

diff --git a/src/mesa/drivers/dri/gamma/gamma_vb.c b/src/mesa/drivers/dri/gamma/gamma_vb.c
index 23ca0714c59ce86c7db5dbb8cc8bdf8fd8e15103..013f856dcde0bbc08679cade6856841d4756174f 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_vb.c
+++ b/src/mesa/drivers/dri/gamma/gamma_vb.c
@@ -29,13 +29,13 @@
 #include "main/mtypes.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tcontext.h"
 #include "tnl/tnl.h"
 
-#include "gammacontext.h"
+#include "gamma_context.h"
 #include "gamma_vb.h"
 #include "gamma_tris.h"
 
@@ -338,7 +338,7 @@ void gammaInitVB( GLcontext *ctx )
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   gmesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32);
+   gmesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32);
 
    {
       static int firsttime = 1;
@@ -355,7 +355,7 @@ void gammaFreeVB( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
    if (gmesa->verts) {
-      ALIGN_FREE(gmesa->verts);
+      _mesa_align_free(gmesa->verts);
       gmesa->verts = 0;
    }
 }