Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / mach64 / mach64_vb.c

diff --git a/src/mesa/drivers/dri/mach64/mach64_vb.c b/src/mesa/drivers/dri/mach64/mach64_vb.c
index e58812e9028530bf2d6b1b1f95725773678c113e..d0c04d3d03464b2cda781d946b86f813f211268e 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_vb.c
+++ b/src/mesa/drivers/dri/mach64/mach64_vb.c
@@ -42,7 +42,6 @@
 #include "mach64_vb.h"
 #include "mach64_ioctl.h"
 #include "mach64_tris.h"
-#include "mach64_state.h"
 
 
 #define MACH64_TEX1_BIT       0x1
@@ -55,10 +54,10 @@
 #define MACH64_MAX_SETUP      0x80
 
 static struct {
-   void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
+   void                (*emit)( struct gl_context *, GLuint, GLuint, void *, GLuint );
    tnl_interp_func             interp;
    tnl_copy_pv_func            copy_pv;
-   GLboolean           (*check_tex_sizes)( GLcontext *ctx );
+   GLboolean           (*check_tex_sizes)( struct gl_context *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
 } setup_tab[MACH64_MAX_SETUP];
@@ -492,7 +491,7 @@ void mach64PrintSetupFlags( char *msg, GLuint flags )
 
 
 
-void mach64CheckTexSizes( GLcontext *ctx )
+void mach64CheckTexSizes( struct gl_context *ctx )
 {
    mach64ContextPtr mmesa = MACH64_CONTEXT( ctx );
 
@@ -512,7 +511,7 @@ void mach64CheckTexSizes( GLcontext *ctx )
    }
 }
 
-void mach64BuildVertices( GLcontext *ctx,
+void mach64BuildVertices( struct gl_context *ctx,
                        GLuint start,
                        GLuint count,
                        GLuint newinputs )
@@ -558,7 +557,7 @@ void mach64BuildVertices( GLcontext *ctx,
    }
 }
 
-void mach64ChooseVertexState( GLcontext *ctx )
+void mach64ChooseVertexState( struct gl_context *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    mach64ContextPtr mmesa = MACH64_CONTEXT( ctx );
@@ -603,7 +602,7 @@ void mach64ChooseVertexState( GLcontext *ctx )
 
 
 #if 0
-void mach64_emit_contiguous_verts( GLcontext *ctx,
+void mach64_emit_contiguous_verts( struct gl_context *ctx,
                                 GLuint start,
                                 GLuint count )
 {
@@ -615,12 +614,12 @@ void mach64_emit_contiguous_verts( GLcontext *ctx,
 #endif
 
 
-void mach64InitVB( GLcontext *ctx )
+void mach64InitVB( struct gl_context *ctx )
 {
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   mmesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32);
+   mmesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32);
 
    {
       static int firsttime = 1;
@@ -632,11 +631,11 @@ void mach64InitVB( GLcontext *ctx )
 }
 
 
-void mach64FreeVB( GLcontext *ctx )
+void mach64FreeVB( struct gl_context *ctx )
 {
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
    if (mmesa->verts) {
-      ALIGN_FREE(mmesa->verts);
+      _mesa_align_free(mmesa->verts);
       mmesa->verts = 0;
    }
 }