fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move matrix type enum out of GLmatrix struct

Browse source
This commit is contained in:
Brian Paul 2003-02-25 19:27:06 +00:00
parent a10be7fb85
commit adb1a2911a
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/math/m_debug_xform.c
View file

@ -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,

23
src/mesa/math/m_matrix.h
View file

@ -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;