projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svga: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
[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 4734754ea4016dd470fdf9466a109230387f29d8..a27534256338405465f1461032e2e46dad435233 100644
(file)
--- a/
src/mesa/tnl/t_vb_vertex.c
+++ b/
src/mesa/tnl/t_vb_vertex.c
@@
-152,16
+152,16
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
* Use combined ModelProject to avoid some depth artifacts
*/
if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)
* Use combined ModelProject to avoid some depth artifacts
*/
if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)
- VB->EyePtr = VB->
ObjPtr
;
+ VB->EyePtr = VB->
AttribPtr[_TNL_ATTRIB_POS]
;
else
VB->EyePtr = TransformRaw( &store->eye,
ctx->ModelviewMatrixStack.Top,
else
VB->EyePtr = TransformRaw( &store->eye,
ctx->ModelviewMatrixStack.Top,
- VB->
ObjPtr
);
+ VB->
AttribPtr[_TNL_ATTRIB_POS]
);
}
VB->ClipPtr = TransformRaw( &store->clip,
&ctx->_ModelProjectMatrix,
}
VB->ClipPtr = TransformRaw( &store->clip,
&ctx->_ModelProjectMatrix,
- VB->
ObjPtr
);
+ VB->
AttribPtr[_TNL_ATTRIB_POS]
);
/* Drivers expect this to be clean to element 4...
*/
/* Drivers expect this to be clean to element 4...
*/
@@
-246,7
+246,7
@@
static GLboolean init_vertex_stage( GLcontext *ctx,
_mesa_vector4f_alloc( &store->clip, 0, size, 32 );
_mesa_vector4f_alloc( &store->proj, 0, size, 32 );
_mesa_vector4f_alloc( &store->clip, 0, size, 32 );
_mesa_vector4f_alloc( &store->proj, 0, size, 32 );
- store->clipmask = (GLubyte *)
ALIGN_MALLOC
(sizeof(GLubyte)*size, 32 );
+ store->clipmask = (GLubyte *)
_mesa_align_malloc
(sizeof(GLubyte)*size, 32 );
if (!store->clipmask ||
!store->eye.data ||
if (!store->clipmask ||
!store->eye.data ||
@@
-265,7
+265,7
@@
static void dtr( struct tnl_pipeline_stage *stage )
_mesa_vector4f_free( &store->eye );
_mesa_vector4f_free( &store->clip );
_mesa_vector4f_free( &store->proj );
_mesa_vector4f_free( &store->eye );
_mesa_vector4f_free( &store->clip );
_mesa_vector4f_free( &store->proj );
-
ALIGN_FREE
( store->clipmask );
+
_mesa_align_free
( store->clipmask );
FREE(store);
stage->privatePtr = NULL;
stage->run = init_vertex_stage;
FREE(store);
stage->privatePtr = NULL;
stage->run = init_vertex_stage;