summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl/t_context.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-04-19 12:32:14 +0000
committerBrian Paul <[email protected]>2002-04-19 12:32:14 +0000
commit05be7ae1253ad68d80816395c3d09665e5619ebc (patch)
treeaaa634bb60d5cbce9f5da87873ffc36f9b942da3 /src/mesa/tnl/t_context.h
parent0c527ab0546eb1de9ee10cc31bc386a40e6b3f98 (diff)
pass context pointer to _tnl_free_immediate(), removed backref pointer
Diffstat (limited to 'src/mesa/tnl/t_context.h')
-rw-r--r--src/mesa/tnl/t_context.h36
1 files changed, 34 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index 31d917f3d58..dc4cb3730cc 100644
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -1,4 +1,4 @@
-/* $Id: t_context.h,v 1.40 2002/04/09 16:56:52 keithw Exp $ */
+/* $Id: t_context.h,v 1.41 2002/04/19 12:32:14 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -93,6 +93,39 @@
#define VERT_BIT_CLIP VERT_BIT_END /* vb only, reuse imm bit*/
+/*
+ * XXXX these are temporary - for backward compatibility w/ DRI drivers
+ */
+#define VERT_OBJ VERT_BIT_POS
+#define VERT_RGBA VERT_BIT_COLOR0
+#define VERT_NORM VERT_BIT_NORMAL
+#define VERT_INDEX VERT_BIT_INDEX
+#define VERT_EDGE VERT_BIT_SEVEN
+#define VERT_SPEC_RGB VERT_BIT_COLOR1
+#define VERT_FOG_COORD VERT_BIT_FOG
+#define VERT_TEX0 VERT_BIT_TEX0
+#define VERT_TEX1 VERT_BIT_TEX1
+#define VERT_TEX2 VERT_BIT_TEX2
+#define VERT_TEX3 VERT_BIT_TEX3
+#define VERT_TEX4 VERT_BIT_TEX4
+#define VERT_TEX5 VERT_BIT_TEX5
+#define VERT_TEX6 VERT_BIT_TEX6
+#define VERT_TEX7 VERT_BIT_TEX7
+#define VERT_EVAL_C1 VERT_BIT_EVAL_C1
+#define VERT_EVAL_C2 VERT_BIT_EVAL_C2
+#define VERT_EVAL_P1 VERT_BIT_EVAL_P1
+#define VERT_EVAL_P2 VERT_BIT_EVAL_P2
+#define VERT_OBJ_3 VERT_BIT_OBJ_3
+#define VERT_OBJ_4 VERT_BIT_OBJ_4
+#define VERT_MATERIAL VERT_BIT_MATERIAL
+#define VERT_ELT VERT_BIT_ELT
+#define VERT_BEGIN VERT_BIT_BEGIN
+#define VERT_END VERT_BIT_END
+#define VERT_END_VB VERT_BIT_END_VB
+#define VERT_POINT_SIZE VERT_BIT_POINT_SIZE
+#define VERT_EYE VERT_BIT_EYE
+#define VERT_CLIP VERT_BIT_CLIP
+
/* Flags for IM->TexCoordSize. Enough flags for 16 units.
*/
@@ -150,7 +183,6 @@
*/
struct immediate
{
- struct __GLcontextRec *backref;
GLuint id, ref_count;
/* This must be saved when immediates are shared in display lists.