diff options
| author | Keith Whitwell <[email protected]> | 2001-02-15 01:33:52 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2001-02-15 01:33:52 +0000 |
| commit | c6b2a92613a5110dbf387721af8ec505744183b9 (patch) | |
| tree | 00358af747ddad95ba79c8649b39329e48b2cfd1 /src/mesa/tnl/t_context.h | |
| parent | 4e52e192b2507a001817c8172713016cef69206b (diff) | |
Fix propogation of material values in VB's that don't reach the lighting
stage. (Materials now treated more like colors, etc.).
Continue whipping the dd templates into shape.
Remove old NormalLength code; may come back as a driver helper, but not
useful for, eg. hardware t&l drivers.
Diffstat (limited to 'src/mesa/tnl/t_context.h')
| -rw-r--r-- | src/mesa/tnl/t_context.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index c15dd130876..a1707673422 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.13 2001/01/29 20:47:39 keithw Exp $ */ +/* $Id: t_context.h,v 1.14 2001/02/15 01:33:52 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -192,7 +192,9 @@ struct immediate */ struct gl_material (*Material)[2]; GLuint *MaterialMask; - GLfloat *NormalLengths; + GLuint LastMaterial; + GLuint MaterialOrMask; + GLfloat (*TexCoord[MAX_TEXTURE_UNITS])[4]; GLuint Primitive[IMM_SIZE]; /* BEGIN/END */ @@ -258,7 +260,6 @@ typedef struct vertex_buffer GLubyte ClipOrMask; /* VERT_CLIP (3) */ GLubyte *ClipMask; /* VERT_CLIP (4) */ GLvector3f *NormalPtr; /* VERT_NORM */ - GLfloat *NormalLengthPtr; /* VERT_NORM (optional) */ GLboolean *EdgeFlag; /* VERT_EDGE */ GLvector4f *TexCoordPtr[MAX_TEXTURE_UNITS]; /* VERT_TEX_0..n */ GLvector1ui *IndexPtr[2]; /* VERT_INDEX */ |