projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up/renaming of the per-vertex attribute bits, specifically, the
[mesa.git]
/
src
/
mesa
/
tnl
/
t_vb_vertex.c
diff --git
a/src/mesa/tnl/t_vb_vertex.c
b/src/mesa/tnl/t_vb_vertex.c
index 8ceb9dbdafd3c32da7fb5a39422f510e09a359bb..9026ec51445d617d9235c4e0e155e3cca2b77583 100644
(file)
--- a/
src/mesa/tnl/t_vb_vertex.c
+++ b/
src/mesa/tnl/t_vb_vertex.c
@@
-1,4
+1,4
@@
-/* $Id: t_vb_vertex.c,v 1.1
1 2001/12/18 04:06:46
brianp Exp $ */
+/* $Id: t_vb_vertex.c,v 1.1
2 2002/01/22 14:35:17
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-172,7
+172,7
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
if (VB->ClipPtr->size < 4) {
if (VB->ClipPtr->flags & VEC_NOT_WRITEABLE) {
ASSERT(VB->ClipPtr == VB->ObjPtr);
if (VB->ClipPtr->size < 4) {
if (VB->ClipPtr->flags & VEC_NOT_WRITEABLE) {
ASSERT(VB->ClipPtr == VB->ObjPtr);
- VB->import_data( ctx, VERT_
OBJ_BIT
, VEC_NOT_WRITEABLE );
+ VB->import_data( ctx, VERT_
BIT_POS
, VEC_NOT_WRITEABLE );
VB->ClipPtr = VB->ObjPtr;
}
if (VB->ClipPtr->size == 2)
VB->ClipPtr = VB->ObjPtr;
}
if (VB->ClipPtr->size == 2)
@@
-225,8
+225,8
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
VB->ClipOrMask = store->ormask;
VB->ClipMask = store->clipmask;
VB->ClipOrMask = store->ormask;
VB->ClipMask = store->clipmask;
- if (VB->ClipPtr == VB->ObjPtr && (VB->importable_data & VERT_
OBJ_BIT
))
- VB->importable_data |= VERT_CLIP;
+ if (VB->ClipPtr == VB->ObjPtr && (VB->importable_data & VERT_
BIT_POS
))
+ VB->importable_data |= VERT_
BIT_
CLIP;
store->save_eyeptr = VB->EyePtr;
store->save_clipptr = VB->ClipPtr;
store->save_eyeptr = VB->EyePtr;
store->save_clipptr = VB->ClipPtr;
@@
-240,8
+240,8
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
VB->NdcPtr = store->save_ndcptr;
VB->ClipMask = store->clipmask;
VB->ClipOrMask = store->ormask;
VB->NdcPtr = store->save_ndcptr;
VB->ClipMask = store->clipmask;
VB->ClipOrMask = store->ormask;
- if (VB->ClipPtr == VB->ObjPtr && (VB->importable_data & VERT_
OBJ_BIT
))
- VB->importable_data |= VERT_CLIP;
+ if (VB->ClipPtr == VB->ObjPtr && (VB->importable_data & VERT_
BIT_POS
))
+ VB->importable_data |= VERT_
BIT_
CLIP;
if (store->andmask)
return GL_FALSE;
}
if (store->andmask)
return GL_FALSE;
}
@@
-310,8
+310,8
@@
const struct gl_pipeline_stage _tnl_vertex_transform_stage =
_NEW_PROJECTION|
_NEW_TRANSFORM, /* re-run */
GL_TRUE, /* active */
_NEW_PROJECTION|
_NEW_TRANSFORM, /* re-run */
GL_TRUE, /* active */
- VERT_
OBJ_BIT
, /* inputs */
- VERT_
EYE|VER
T_CLIP, /* outputs */
+ VERT_
BIT_POS
, /* inputs */
+ VERT_
BIT_EYE|VERT_BI
T_CLIP, /* outputs */
0, /* changed_inputs */
NULL, /* private data */
dtr, /* destructor */
0, /* changed_inputs */
NULL, /* private data */
dtr, /* destructor */