On Sun, Feb 10, 2002 at 05:12:40AM +0000, Michael wrote:
> Ok. Done.
.... and here's the patch.
--
Michael.
Index: src/state.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/extras/Mesa/src/state.c,v
retrieving revision 1.13.20.1
diff -u -3 -p -r1.13.20.1 state.c
--- src/state.c 3 Dec 2001 14:53:46 -0000 1.13.20.1
+++ src/state.c 13 Feb 2002 00:57:56 -0000
@@ -510,13 +510,11 @@ update_polygon( GLcontext *ctx )
static void
calculate_model_project_matrix( GLcontext *ctx )
{
- if (!ctx->_NeedEyeCoords) {
- _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
- &ctx->ProjectionMatrix,
- &ctx->ModelView );
+ _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
+ &ctx->ProjectionMatrix,
+ &ctx->ModelView );
- _math_matrix_analyse( &ctx->_ModelProjectMatrix );
- }
+ _math_matrix_analyse( &ctx->_ModelProjectMatrix );
}
static void
Index: src/tnl/t_vb_vertex.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/extras/Mesa/src/tnl/Attic/t_vb_vertex.c,v
retrieving revision 1.1.6.1
diff -u -3 -p -r1.1.6.1 t_vb_vertex.c
--- src/tnl/t_vb_vertex.c 3 Dec 2001 14:53:54 -0000 1.1.6.1
+++ src/tnl/t_vb_vertex.c 13 Feb 2002 00:57:59 -0000
@@ -151,8 +151,8 @@ static GLboolean run_vertex_stage( GLcon
if (ctx->ProjectionMatrix.type == MATRIX_IDENTITY)
VB->ClipPtr = VB->EyePtr;
else
- VB->ClipPtr = TransformRaw( &store->clip, &ctx->ProjectionMatrix,
- VB->EyePtr );
+ VB->ClipPtr = TransformRaw( &store->clip, &ctx->_ModelProjectMatrix,
+ VB->ObjPtr );
}
else {
/* Combined modelviewproject transform:
