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/shader/nvvertexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/shader') diff --git a/src/mesa/shader/nvvertexec.c b/src/mesa/shader/nvvertexec.c index 679400c13ec..c294bca5c27 100644 --- a/src/mesa/shader/nvvertexec.c +++ b/src/mesa/shader/nvvertexec.c @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.3 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -145,7 +145,7 @@ _mesa_init_vp_per_primitive_registers(GLcontext *ctx) } else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) { _math_matrix_analyse(mat); /* update the inverse */ - assert((mat->flags & MAT_DIRTY_INVERSE) == 0); + ASSERT(!math_matrix_is_dirty(mat)); load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv); } else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) { @@ -155,7 +155,7 @@ _mesa_init_vp_per_primitive_registers(GLcontext *ctx) assert(ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_TRANSPOSE_NV); _math_matrix_analyse(mat); /* update the inverse */ - assert((mat->flags & MAT_DIRTY_INVERSE) == 0); + ASSERT(!math_matrix_is_dirty(mat)); load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv); } } -- cgit v1.2.3