Drop macro wrappers for the aligned memory functions

[mesa.git] / src / mesa / drivers / glide / fxvb.c

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 1dc5f9891a1613c876e13bbf7a13fa96b9cd8ae4..64453cbe4b56e0a94ea6dd72245070d7e30432bf 100644 (file)
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -104,24 +104,24 @@ static void interp_extras( GLcontext *ctx,
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
 
-   if (VB->ColorPtr[1]) {
-      /* If stride is zero, ColorPtr[1] is constant across the VB, so
+   if (VB->BackfaceColorPtr) {
+      /* If stride is zero, BackfaceColorPtr is constant across the VB, so
        * there is no point interpolating between two values as they will
        * be identical.  This case is handled in t_dd_tritmp.h
        */
-      if (VB->ColorPtr[1]->stride) {
-        assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+      if (VB->BackfaceColorPtr->stride) {
+        assert(VB->BackfaceColorPtr->stride == 4 * sizeof(GLfloat));
         INTERP_4F( t,
-                   GET_COLOR(VB->ColorPtr[1], dst),
-                   GET_COLOR(VB->ColorPtr[1], out),
-                   GET_COLOR(VB->ColorPtr[1], in) );
+                   GET_COLOR(VB->BackfaceColorPtr, dst),
+                   GET_COLOR(VB->BackfaceColorPtr, out),
+                   GET_COLOR(VB->BackfaceColorPtr, in) );
       }
 
-      if (VB->SecondaryColorPtr[1]) {
+      if (VB->BackfaceSecondaryColorPtr) {
         INTERP_3F( t,
-                   GET_COLOR(VB->SecondaryColorPtr[1], dst),
-                   GET_COLOR(VB->SecondaryColorPtr[1], out),
-                   GET_COLOR(VB->SecondaryColorPtr[1], in) );
+                   GET_COLOR(VB->BackfaceSecondaryColorPtr, dst),
+                   GET_COLOR(VB->BackfaceSecondaryColorPtr, out),
+                   GET_COLOR(VB->BackfaceSecondaryColorPtr, in) );
       }
    }
 
@@ -137,13 +137,13 @@ static void copy_pv_extras( GLcontext *ctx, GLuint dst, GLuint src )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
 
-   if (VB->ColorPtr[1]) {
-        COPY_4FV( GET_COLOR(VB->ColorPtr[1], dst),
-                  GET_COLOR(VB->ColorPtr[1], src) );
+   if (VB->BackfaceColorPtr) {
+        COPY_4FV( GET_COLOR(VB->BackfaceColorPtr, dst),
+                  GET_COLOR(VB->BackfaceColorPtr, src) );
 
-        if (VB->SecondaryColorPtr[1]) {
-           COPY_3FV( GET_COLOR(VB->SecondaryColorPtr[1], dst),
-                     GET_COLOR(VB->SecondaryColorPtr[1], src) );
+        if (VB->BackfaceSecondaryColorPtr) {
+           COPY_3FV( GET_COLOR(VB->BackfaceSecondaryColorPtr, dst),
+                     GET_COLOR(VB->BackfaceSecondaryColorPtr, src) );
         }
    }
 
@@ -808,7 +808,7 @@ void fxAllocVB( GLcontext *ctx )
       firsttime = 0;
    }
 
-   fxMesa->verts = (GrVertex *)ALIGN_MALLOC(size * sizeof(GrVertex), 32);
+   fxMesa->verts = (GrVertex *)_mesa_align_malloc(size * sizeof(GrVertex), 32);
    fxMesa->SetupIndex = SETUP_XYZW|SETUP_RGBA;
 }
 
@@ -817,7 +817,7 @@ void fxFreeVB( GLcontext *ctx )
 {
    fxMesaContext fxMesa = FX_CONTEXT(ctx);
    if (fxMesa->verts) {
-      ALIGN_FREE(fxMesa->verts);
+      _mesa_align_free(fxMesa->verts);
       fxMesa->verts = 0;
    }
 }