projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mga
/
mgavb.c
diff --git
a/src/mesa/drivers/dri/mga/mgavb.c
b/src/mesa/drivers/dri/mga/mgavb.c
index 1c635b23a65d9967ff1a2ec4a1f08c8291b7b5da..f098aa5cbc074a6c853fc66bde3fe053eb6b1ebc 100644
(file)
--- a/
src/mesa/drivers/dri/mga/mgavb.c
+++ b/
src/mesa/drivers/dri/mga/mgavb.c
@@
-39,7
+39,6
@@
#include "main/colormac.h"
#include "tnl/t_context.h"
#include "main/colormac.h"
#include "tnl/t_context.h"
-#include "swrast_setup/swrast_setup.h"
#include "swrast/swrast.h"
#include "swrast/swrast.h"
@@
-53,10
+52,10
@@
#define MGA_MAX_SETUP 0x80
static struct {
#define MGA_MAX_SETUP 0x80
static struct {
- void (*emit)(
GL
context *, GLuint, GLuint, void *, GLuint );
+ void (*emit)(
struct gl_
context *, GLuint, GLuint, void *, GLuint );
tnl_interp_func interp;
tnl_copy_pv_func copy_pv;
tnl_interp_func interp;
tnl_copy_pv_func copy_pv;
- GLboolean (*check_tex_sizes)(
GL
context *ctx );
+ GLboolean (*check_tex_sizes)(
struct gl_
context *ctx );
GLuint vertex_size;
GLuint vertex_format;
} setup_tab[MGA_MAX_SETUP];
GLuint vertex_size;
GLuint vertex_format;
} setup_tab[MGA_MAX_SETUP];
@@
-317,7
+316,7
@@
void mgaPrintSetupFlags(char *msg, GLuint flags )
}
}
-void mgaCheckTexSizes(
GL
context *ctx )
+void mgaCheckTexSizes(
struct gl_
context *ctx )
{
mgaContextPtr mmesa = MGA_CONTEXT( ctx );
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
mgaContextPtr mmesa = MGA_CONTEXT( ctx );
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@
-340,7
+339,7
@@
void mgaCheckTexSizes( GLcontext *ctx )
}
}
-void mgaBuildVertices(
GL
context *ctx,
+void mgaBuildVertices(
struct gl_
context *ctx,
GLuint start,
GLuint count,
GLuint newinputs )
GLuint start,
GLuint count,
GLuint newinputs )
@@
-387,7
+386,7
@@
void mgaBuildVertices( GLcontext *ctx,
}
}
-void mgaChooseVertexState(
GL
context *ctx )
+void mgaChooseVertexState(
struct gl_
context *ctx )
{
mgaContextPtr mmesa = MGA_CONTEXT( ctx );
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
mgaContextPtr mmesa = MGA_CONTEXT( ctx );
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@
-434,7
+433,7
@@
void mgaChooseVertexState( GLcontext *ctx )
-void *mga_emit_contiguous_verts(
GL
context *ctx,
+void *mga_emit_contiguous_verts(
struct gl_
context *ctx,
GLuint start,
GLuint count,
void *dest)
GLuint start,
GLuint count,
void *dest)
@@
-447,12
+446,12
@@
void *mga_emit_contiguous_verts( GLcontext *ctx,
-void mgaInitVB(
GL
context *ctx )
+void mgaInitVB(
struct gl_
context *ctx )
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);
GLuint size = TNL_CONTEXT(ctx)->vb.Size;
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);
GLuint size = TNL_CONTEXT(ctx)->vb.Size;
- mmesa->verts = (GLubyte *)
ALIGN_MALLOC
(size * sizeof(mgaVertex), 32);
+ mmesa->verts = (GLubyte *)
_mesa_align_malloc
(size * sizeof(mgaVertex), 32);
{
static int firsttime = 1;
{
static int firsttime = 1;
@@
-468,11
+467,11
@@
void mgaInitVB( GLcontext *ctx )
}
}
-void mgaFreeVB(
GL
context *ctx )
+void mgaFreeVB(
struct gl_
context *ctx )
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);
if (mmesa->verts) {
{
mgaContextPtr mmesa = MGA_CONTEXT(ctx);
if (mmesa->verts) {
-
ALIGN_FREE
(mmesa->verts);
+
_mesa_align_free
(mmesa->verts);
mmesa->verts = 0;
}
}
mmesa->verts = 0;
}
}