From adb1a2911aaaa2dad09b955b20834eb3e1e9caf7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 25 Feb 2003 19:27:06 +0000
Subject: [PATCH] move matrix type enum out of GLmatrix struct

---
 src/mesa/math/m_debug_xform.c |  4 ++--
 src/mesa/math/m_matrix.h      | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index 1feb3cffe13..7879660fdff 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -1,4 +1,4 @@
-/* $Id: m_debug_xform.c,v 1.11 2002/12/04 14:24:44 brianp Exp $ */
+/* $Id: m_debug_xform.c,v 1.12 2003/02/25 19:27:07 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -106,7 +106,7 @@ static int *templates[7] = {
    m_2d_no_rot,
    m_3d
 };
-static int mtypes[7] = {
+static enum matrix_type mtypes[7] = {
    MATRIX_GENERAL,
    MATRIX_IDENTITY,
    MATRIX_3D_NO_ROT,
diff --git a/src/mesa/math/m_matrix.h b/src/mesa/math/m_matrix.h
index d772acc34cc..74eb610e81a 100644
--- a/src/mesa/math/m_matrix.h
+++ b/src/mesa/math/m_matrix.h
@@ -1,4 +1,4 @@
-/* $Id: m_matrix.h,v 1.5 2003/02/17 16:36:06 brianp Exp $ */
+/* $Id: m_matrix.h,v 1.6 2003/02/25 19:27:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -98,20 +98,23 @@
     ((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0)
 
 
+enum matrix_type {
+   MATRIX_GENERAL,	/**< general 4x4 matrix */
+   MATRIX_IDENTITY,   /**< identity matrix */
+   MATRIX_3D_NO_ROT,	/**< ortho projection and others... */
+   MATRIX_PERSPECTIVE,/**< perspective projection matrix */
+   MATRIX_2D, 	/**< 2-D transformation */
+   MATRIX_2D_NO_ROT,	/**< 2-D scale & translate only */
+   MATRIX_3D  	/**< 3-D transformation */
+};
+
 typedef struct {
    GLfloat *m;		/* 16-byte aligned */
    GLfloat *inv;	/* optional, 16-byte aligned */
    GLuint flags;        /**< possible values determined by (of \link
 			   MatFlags MAT_FLAG_* flags\endlink) */
-   enum {
-     MATRIX_GENERAL,	/**< general 4x4 matrix */
-     MATRIX_IDENTITY,   /**< identity matrix */
-     MATRIX_3D_NO_ROT,	/**< ortho projection and others... */
-     MATRIX_PERSPECTIVE,/**< perspective projection matrix */
-     MATRIX_2D, 	/**< 2-D transformation */
-     MATRIX_2D_NO_ROT,	/**< 2-D scale & translate only */
-     MATRIX_3D  	/**< 3-D transformation */
-   } type;
+
+   enum matrix_type type;
 } GLmatrix;
 
 
-- 
2.30.2