From 30f51ae067379c2b3573c06b707d25a9704df7be Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 18 Dec 2001 04:06:44 +0000 Subject: Replace old matrix stacks with new code based on struct matrix_stack. Moved vertex program hash table into shared context state. Implemented reference counting for vertex programs. Replaced tnl "ProjectedClip" with "Ndc" (normalized device coordinates). --- src/mesa/main/clip.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/mesa/main/clip.c') diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c index f18b0b4239..700d271f7b 100644 --- a/src/mesa/main/clip.c +++ b/src/mesa/main/clip.c @@ -1,4 +1,4 @@ -/* $Id: clip.c,v 1.23 2001/09/15 18:02:49 brianp Exp $ */ +/* $Id: clip.c,v 1.24 2001/12/18 04:06:44 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -74,10 +74,11 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq ) * clipping now takes place. The clip-space equations are recalculated * whenever the projection matrix changes. */ - if (ctx->ModelView.flags & MAT_DIRTY) - _math_matrix_analyse( &ctx->ModelView ); + if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY) + _math_matrix_analyse( ctx->ModelviewMatrixStack.Top ); - _mesa_transform_vector( equation, equation, ctx->ModelView.inv ); + _mesa_transform_vector( equation, equation, + ctx->ModelviewMatrixStack.Top->inv ); if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation)) return; @@ -90,12 +91,12 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq ) * code in _mesa_update_state(). */ if (ctx->Transform.ClipEnabled[p]) { - if (ctx->ProjectionMatrix.flags & MAT_DIRTY) - _math_matrix_analyse( &ctx->ProjectionMatrix ); + if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY) + _math_matrix_analyse( ctx->ProjectionMatrixStack.Top ); _mesa_transform_vector( ctx->Transform._ClipUserPlane[p], ctx->Transform.EyeUserPlane[p], - ctx->ProjectionMatrix.inv ); + ctx->ProjectionMatrixStack.Top->inv ); } if (ctx->Driver.ClipPlane) -- cgit v1.2.3