From 049e320f46f3a3daaa36ef67cc680dc504c124d5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 30 Jun 2005 14:22:23 +0000 Subject: Add a set of predicate functions for testing matrices instead of directly testing the flags field. Move definition of all the MAT_FLAGs into the m_matrix.c file since they're now private. --- src/mesa/tnl/t_vb_normals.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mesa/tnl/t_vb_normals.c') diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 9bc6ab4996..7ac33f8bec 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -60,7 +60,7 @@ run_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage) /* We can only use the display list's saved normal lengths if we've * got a transformation matrix with uniform scaling. */ - if (ctx->ModelviewMatrixStack.Top->flags & MAT_FLAG_GENERAL_SCALE) + if (_math_matrix_is_general_scale(ctx->ModelviewMatrixStack.Top)) lengths = NULL; else lengths = VB->NormalLengthPtr; @@ -108,10 +108,7 @@ validate_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage) */ GLuint transform = NORM_TRANSFORM_NO_ROT; - if (ctx->ModelviewMatrixStack.Top->flags & (MAT_FLAG_GENERAL | - MAT_FLAG_ROTATION | - MAT_FLAG_GENERAL_3D | - MAT_FLAG_PERSPECTIVE)) { + if (_math_matrix_has_rotation(ctx->ModelviewMatrixStack.Top)) { /* need to do full (3x3) matrix transform */ transform = NORM_TRANSFORM; } -- cgit v1.2.3