summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-02-24 02:47:05 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-02-24 02:47:05 +0000
commit0f1e19c03cdf5bd8a7c3db59cf395a0833ab0173 (patch)
treef9ec42a8c1814fa5029ddd2ab6cdc0bd9799bd62 /src/mesa/main
parentffa7eff9ff459060364f0ed93865351f7fc15035 (diff)
added some const keywords
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/mtypes.h2
-rw-r--r--src/mesa/main/vtxfmt.c15
-rw-r--r--src/mesa/main/vtxfmt.h8
3 files changed, 13 insertions, 12 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 508a363f16..84fa39f261 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2106,7 +2106,7 @@ struct gl_tnl_module {
/**
* Vertex format to be lazily swapped into current dispatch.
*/
- GLvertexformat *Current;
+ const GLvertexformat *Current;
/**
* \name Record of functions swapped out.
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index b9e3f2ef60..4f9a7c0e24 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -1,9 +1,8 @@
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 6.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -72,7 +71,8 @@
-static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
+static void
+install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
{
tab->ArrayElement = vfmt->ArrayElement;
tab->Color3f = vfmt->Color3f;
@@ -136,7 +136,7 @@ static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
tab->DrawRangeElements = vfmt->DrawRangeElements;
tab->EvalMesh1 = vfmt->EvalMesh1;
tab->EvalMesh2 = vfmt->EvalMesh2;
- assert(tab->EvalMesh2);
+ ASSERT(tab->EvalMesh2);
}
@@ -147,13 +147,14 @@ void _mesa_init_exec_vtxfmt( GLcontext *ctx )
}
-void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
{
ctx->TnlModule.Current = vfmt;
_mesa_restore_exec_vtxfmt( ctx );
}
-void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+
+void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
{
install_vtxfmt( ctx->Save, vfmt );
}
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 310f157b5e..76f108e023 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -7,9 +7,9 @@
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 6.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -35,8 +35,8 @@
extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
-extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
-extern void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
+extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
+extern void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );