From: Brian Paul Date: Sun, 17 Sep 2000 21:56:07 +0000 (+0000) Subject: new comments, misc clean-up X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c56fdc7072c040de68868748dc2d03c58f5ee22;p=mesa.git new comments, misc clean-up --- diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f0ecfbf014e..71cbc6addcf 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.87 2000/09/15 19:45:40 brianp Exp $ */ +/* $Id: context.c,v 1.88 2000/09/17 21:56:07 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -423,7 +423,6 @@ one_time_init( void ) gl_init_translate(); gl_init_vbrender(); gl_init_vbxform(); - gl_init_vertices(); if (getenv("MESA_DEBUG")) { _glapi_noop_enable_warnings(GL_TRUE); @@ -2070,3 +2069,16 @@ const char *_mesa_prim_name[GL_POLYGON+2] = { "culled primitive" }; + +GLenum gl_reduce_prim[GL_POLYGON+1] = { + GL_POINTS, + GL_LINES, + GL_LINES, + GL_LINES, + GL_TRIANGLES, + GL_TRIANGLES, + GL_TRIANGLES, + GL_TRIANGLES, + GL_TRIANGLES, + GL_TRIANGLES, +}; diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 2baeb58cee4..70f7b82e8af 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.8 1999/11/22 18:57:56 brianp Exp $ */ +/* $Id: macros.h,v 1.9 2000/09/17 21:56:07 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -109,7 +109,6 @@ do { \ (DST)[1] = (SRC)[1]; \ } while (0) - #define COPY_3V( DST, SRC ) \ do { \ (DST)[0] = (SRC)[0]; \ @@ -133,7 +132,6 @@ do { \ (DST)[1] = _tmp[1]; \ } while (0) - #define COPY_3FV( DST, SRC ) \ do { \ const GLfloat *_tmp = (SRC); \ @@ -371,11 +369,18 @@ do { \ /* Assign scalers to short vectors: */ -#define ASSIGN_2V( V, V0, V1 ) \ -do { V[0] = V0; V[1] = V1; } while(0) +#define ASSIGN_2V( V, V0, V1 ) \ +do { \ + V[0] = V0; \ + V[1] = V1; \ +} while(0) -#define ASSIGN_3V( V, V0, V1, V2 ) \ -do { V[0] = V0; V[1] = V1; V[2] = V2; } while(0) +#define ASSIGN_3V( V, V0, V1, V2 ) \ +do { \ + V[0] = V0; \ + V[1] = V1; \ + V[2] = V2; \ +} while(0) #define ASSIGN_4V( V, V0, V1, V2, V3 ) \ do { \ @@ -415,7 +420,6 @@ do { \ /* Min of two values: */ #define MIN2( A, B ) ( (A)<(B) ? (A) : (B) ) - /* MAX of two values: */ #define MAX2( A, B ) ( (A)>(B) ? (A) : (B) ) @@ -425,7 +429,6 @@ do { \ /* Dot product of two 3-element vectors */ #define DOT3( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + (a)[2]*(b)[2] ) - /* Dot product of two 4-element vectors */ #define DOT4( a, b ) ( (a)[0]*(b)[0] + (a)[1]*(b)[1] + \ (a)[2]*(b)[2] + (a)[3]*(b)[3] ) @@ -497,4 +500,4 @@ do { \ #define FLOAT_TO_INT(X) ( (GLint) (2147483647.0 * (X)) ) -#endif /*MACROS_H*/ +#endif diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index 4cf7fe63d80..52c48dd32bf 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.19 2000/07/31 15:31:29 brianp Exp $ */ +/* $Id: matrix.c,v 1.20 2000/09/17 21:56:07 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -28,12 +28,10 @@ /* * Matrix operations * - * * NOTES: * 1. 4x4 transformation matrices are stored in memory in column major order. * 2. Points/vertices are to be thought of as column vectors. * 3. Transformation of a point p by a matrix M is: p' = M * p - * */ @@ -60,7 +58,6 @@ static const char *types[] = { "MATRIX_2D_NO_ROT", "MATRIX_3D" }; -static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b ); static GLfloat Identity[16] = { @@ -71,6 +68,10 @@ static GLfloat Identity[16] = { }; + +static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b ); + + static void print_matrix_floats( const GLfloat m[16] ) { int i; @@ -91,8 +92,10 @@ void gl_print_matrix( const GLmatrix *m ) matmul4(prod, m->m, m->inv); fprintf(stderr, "Mat * Inverse:\n"); print_matrix_floats(prod); - } else + } + else { fprintf(stderr, " - not available\n"); + } #endif } @@ -117,7 +120,7 @@ static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b ) { GLint i; for (i = 0; i < 4; i++) { - GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); + const GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0) + ai3 * B(3,0); P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1) + ai3 * B(3,1); P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2) + ai3 * B(3,2); @@ -126,8 +129,6 @@ static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b ) } - - /* Multiply two matrices known to occupy only the top three rows, * such as typical modelling matrices, and ortho matrices. * @@ -137,7 +138,7 @@ static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b ) { GLint i; for (i = 0; i < 3; i++) { - GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); + const GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0); P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1); P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2); @@ -153,7 +154,7 @@ static void matmul4fd( GLfloat *product, const GLfloat *a, const GLdouble *b ) { GLint i; for (i = 0; i < 4; i++) { - GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); + const GLfloat ai0=A(i,0), ai1=A(i,1), ai2=A(i,2), ai3=A(i,3); P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0) + ai3 * B(3,0); P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1) + ai3 * B(3,1); P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2) + ai3 * B(3,2); @@ -166,7 +167,6 @@ static void matmul4fd( GLfloat *product, const GLfloat *a, const GLdouble *b ) #undef P - #define SWAP_ROWS(a, b) { GLfloat *_tmp = a; (a)=(b); (b)=_tmp; } #define MAT(m,r,c) (m)[(c)*4+(r)] @@ -288,6 +288,7 @@ static GLboolean invert_matrix_general( GLmatrix *mat ) } #undef SWAP_ROWS + /* Adapted from graphics gems II. */ static GLboolean invert_matrix_3d_general( GLmatrix *mat ) @@ -355,16 +356,14 @@ static GLboolean invert_matrix_3d( GLmatrix *mat ) const GLfloat *in = mat->m; GLfloat *out = mat->inv; - if (!TEST_MAT_FLAGS(mat, MAT_FLAGS_ANGLE_PRESERVING)) - { + if (!TEST_MAT_FLAGS(mat, MAT_FLAGS_ANGLE_PRESERVING)) { return invert_matrix_3d_general( mat ); } - if (mat->flags & MAT_FLAG_UNIFORM_SCALE) - { - GLfloat scale = (MAT(in,0,0) * MAT(in,0,0) + - MAT(in,0,1) * MAT(in,0,1) + - MAT(in,0,2) * MAT(in,0,2)); + if (mat->flags & MAT_FLAG_UNIFORM_SCALE) { + GLfloat scale = (MAT(in,0,0) * MAT(in,0,0) + + MAT(in,0,1) * MAT(in,0,1) + + MAT(in,0,2) * MAT(in,0,2)); if (scale == 0.0) return GL_FALSE; @@ -382,8 +381,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat ) MAT(out,1,2) = scale * MAT(in,2,1); MAT(out,2,2) = scale * MAT(in,2,2); } - else if (mat->flags & MAT_FLAG_ROTATION) - { + else if (mat->flags & MAT_FLAG_ROTATION) { /* Transpose the 3 by 3 upper-left submatrix. */ MAT(out,0,0) = MAT(in,0,0); MAT(out,1,0) = MAT(in,0,1); @@ -395,8 +393,8 @@ static GLboolean invert_matrix_3d( GLmatrix *mat ) MAT(out,1,2) = MAT(in,2,1); MAT(out,2,2) = MAT(in,2,2); } - else /* pure translation */ - { + else { + /* pure translation */ MEMCPY( out, Identity, sizeof(Identity) ); MAT(out,0,3) = - MAT(in,0,3); MAT(out,1,3) = - MAT(in,1,3); @@ -404,8 +402,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat ) return GL_TRUE; } - if (mat->flags & MAT_FLAG_TRANSLATION) - { + if (mat->flags & MAT_FLAG_TRANSLATION) { /* Do the translation part */ MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) + MAT(in,1,3) * MAT(out,0,1) + @@ -417,8 +414,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat ) MAT(in,1,3) * MAT(out,2,1) + MAT(in,2,3) * MAT(out,2,2) ); } - else - { + else { MAT(out,0,3) = MAT(out,1,3) = MAT(out,2,3) = 0.0; } @@ -447,8 +443,7 @@ static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat ) MAT(out,1,1) = 1.0 / MAT(in,1,1); MAT(out,2,2) = 1.0 / MAT(in,2,2); - if (mat->flags & MAT_FLAG_TRANSLATION) - { + if (mat->flags & MAT_FLAG_TRANSLATION) { MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0)); MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1)); MAT(out,2,3) = - (MAT(in,2,3) * MAT(out,2,2)); @@ -470,8 +465,7 @@ static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat ) MAT(out,0,0) = 1.0 / MAT(in,0,0); MAT(out,1,1) = 1.0 / MAT(in,1,1); - if (mat->flags & MAT_FLAG_TRANSLATION) - { + if (mat->flags & MAT_FLAG_TRANSLATION) { MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0)); MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1)); } @@ -508,6 +502,7 @@ static GLboolean invert_matrix_perspective( GLmatrix *mat ) typedef GLboolean (*inv_mat_func)( GLmatrix *mat ); + static inv_mat_func inv_mat_tab[7] = { invert_matrix_general, invert_matrix_identity, @@ -519,7 +514,7 @@ static inv_mat_func inv_mat_tab[7] = { }; -GLboolean gl_matrix_invert( GLmatrix *mat ) +static GLboolean matrix_invert( GLmatrix *mat ) { if (inv_mat_tab[mat->type](mat)) { #if 0 @@ -745,8 +740,7 @@ static void analyze_from_scratch( GLmatrix *mat ) GLuint mask = 0; GLuint i; - for (i = 0 ; i < 16 ; i++) - { + for (i = 0 ; i < 16 ; i++) { if (m[i] == 0.0) mask |= (1<type = MATRIX_IDENTITY; } - else if ((mask & MASK_2D_NO_ROT) == MASK_2D_NO_ROT) - { + else if ((mask & MASK_2D_NO_ROT) == MASK_2D_NO_ROT) { mat->type = MATRIX_2D_NO_ROT; if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE) mat->flags = MAT_FLAG_GENERAL_SCALE; } - else if ((mask & MASK_2D) == MASK_2D) - { + else if ((mask & MASK_2D) == MASK_2D) { GLfloat mm = DOT2(m, m); GLfloat m4m4 = DOT2(m+4,m+4); GLfloat mm4 = DOT2(m,m+4); @@ -794,20 +786,21 @@ static void analyze_from_scratch( GLmatrix *mat ) mat->flags |= MAT_FLAG_ROTATION; } - else if ((mask & MASK_3D_NO_ROT) == MASK_3D_NO_ROT) - { + else if ((mask & MASK_3D_NO_ROT) == MASK_3D_NO_ROT) { mat->type = MATRIX_3D_NO_ROT; /* Check for scale */ if (SQ(m[0]-m[5]) < SQ(1e-6) && SQ(m[0]-m[10]) < SQ(1e-6)) { - if (SQ(m[0]-1.0) > SQ(1e-6)) + if (SQ(m[0]-1.0) > SQ(1e-6)) { mat->flags |= MAT_FLAG_UNIFORM_SCALE; - } else + } + } + else { mat->flags |= MAT_FLAG_GENERAL_SCALE; + } } - else if ((mask & MASK_3D) == MASK_3D) - { + else if ((mask & MASK_3D) == MASK_3D) { GLfloat c1 = DOT3(m,m); GLfloat c2 = DOT3(m+4,m+4); GLfloat c3 = DOT3(m+8,m+8); @@ -821,8 +814,10 @@ static void analyze_from_scratch( GLmatrix *mat ) if (SQ(c1-1.0) > SQ(1e-6)) mat->flags |= MAT_FLAG_UNIFORM_SCALE; /* else no scale at all */ - } else + } + else { mat->flags |= MAT_FLAG_GENERAL_SCALE; + } /* Check for rotation */ if (SQ(d1) < SQ(1e-6)) { @@ -833,11 +828,11 @@ static void analyze_from_scratch( GLmatrix *mat ) else mat->flags |= MAT_FLAG_GENERAL_3D; } - else + else { mat->flags |= MAT_FLAG_GENERAL_3D; /* shear, etc */ + } } - else if ((mask & MASK_PERSPECTIVE) == MASK_PERSPECTIVE && m[11]==-1.0F) - { + else if ((mask & MASK_PERSPECTIVE) == MASK_PERSPECTIVE && m[11]==-1.0F) { mat->type = MATRIX_PERSPECTIVE; mat->flags |= MAT_FLAG_GENERAL; } @@ -860,8 +855,7 @@ static void analyze_from_flags( GLmatrix *mat ) } else if (TEST_MAT_FLAGS(mat, (MAT_FLAG_TRANSLATION | MAT_FLAG_UNIFORM_SCALE | - MAT_FLAG_GENERAL_SCALE))) - { + MAT_FLAG_GENERAL_SCALE))) { if ( m[10]==1.0F && m[14]==0.0F ) { mat->type = MATRIX_2D_NO_ROT; } @@ -872,26 +866,22 @@ static void analyze_from_flags( GLmatrix *mat ) else if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) { if ( m[ 8]==0.0F && m[ 9]==0.0F - && m[2]==0.0F && m[6]==0.0F && m[10]==1.0F && m[14]==0.0F) - { + && m[2]==0.0F && m[6]==0.0F && m[10]==1.0F && m[14]==0.0F) { mat->type = MATRIX_2D; } - else - { + else { mat->type = MATRIX_3D; } } else if ( m[4]==0.0F && m[12]==0.0F && m[1]==0.0F && m[13]==0.0F && m[2]==0.0F && m[6]==0.0F - && m[3]==0.0F && m[7]==0.0F && m[11]==-1.0F && m[15]==0.0F) - { + && m[3]==0.0F && m[7]==0.0F && m[11]==-1.0F && m[15]==0.0F) { mat->type = MATRIX_PERSPECTIVE; } else { mat->type = MATRIX_GENERAL; } - } @@ -905,7 +895,7 @@ void gl_matrix_analyze( GLmatrix *mat ) } if (mat->inv && (mat->flags & MAT_DIRTY_INVERSE)) { - gl_matrix_invert( mat ); + matrix_invert( mat ); } mat->flags &= ~(MAT_DIRTY_FLAGS| @@ -914,6 +904,131 @@ void gl_matrix_analyze( GLmatrix *mat ) } +/* + * Multiply a matrix by an array of floats with known properties. + */ +#if 000 +static void gl_mat_mul_mat( GLmatrix *mat, const GLmatrix *m ) +{ + mat->flags |= (m->flags | + MAT_DIRTY_TYPE | + MAT_DIRTY_INVERSE | + MAT_DIRTY_DEPENDENTS); + + if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) + matmul34( mat->m, mat->m, m->m ); + else + matmul4( mat->m, mat->m, m->m ); +} +#endif + + +static void matrix_copy( GLmatrix *to, const GLmatrix *from ) +{ + MEMCPY( to->m, from->m, sizeof(Identity) ); + to->flags = from->flags | MAT_DIRTY_DEPENDENTS; + to->type = from->type; + + if (to->inv != 0) { + if (from->inv == 0) { + matrix_invert( to ); + } + else { + MEMCPY(to->inv, from->inv, sizeof(GLfloat)*16); + } + } +} + +/* + * Multiply a matrix by an array of floats with known properties. + */ +static void mat_mul_floats( GLmatrix *mat, const GLfloat *m, GLuint flags ) +{ + mat->flags |= (flags | + MAT_DIRTY_TYPE | + MAT_DIRTY_INVERSE | + MAT_DIRTY_DEPENDENTS); + + if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) + matmul34( mat->m, mat->m, m ); + else + matmul4( mat->m, mat->m, m ); + +} + + +void gl_calculate_model_project_matrix( GLcontext *ctx ) +{ + gl_matrix_mul( &ctx->ModelProjectMatrix, + &ctx->ProjectionMatrix, + &ctx->ModelView ); + + gl_matrix_analyze( &ctx->ModelProjectMatrix ); +} + + +void gl_matrix_ctr( GLmatrix *m ) +{ + if ( m->m == 0 ) { + m->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 ); + } + MEMCPY( m->m, Identity, sizeof(Identity) ); + m->inv = 0; + m->type = MATRIX_IDENTITY; + m->flags = MAT_DIRTY_DEPENDENTS; +} + +void gl_matrix_dtr( GLmatrix *m ) +{ + if ( m->m != 0 ) { + ALIGN_FREE( m->m ); + m->m = 0; + } + if ( m->inv != 0 ) { + ALIGN_FREE( m->inv ); + m->inv = 0; + } +} + +#if 0 +void gl_matrix_set_identity( GLmatrix *m ) +{ + MEMCPY( m->m, Identity, sizeof(Identity) ); + m->type = MATRIX_IDENTITY; + m->flags = MAT_DIRTY_DEPENDENTS; +} +#endif + +void gl_matrix_alloc_inv( GLmatrix *m ) +{ + if ( m->inv == 0 ) { + m->inv = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 ); + MEMCPY( m->inv, Identity, 16 * sizeof(GLfloat) ); + } +} + + +void gl_matrix_mul( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b ) +{ + dest->flags = (a->flags | + b->flags | + MAT_DIRTY_TYPE | + MAT_DIRTY_INVERSE | + MAT_DIRTY_DEPENDENTS); + + if (TEST_MAT_FLAGS(dest, MAT_FLAGS_3D)) + matmul34( dest->m, a->m, b->m ); + else + matmul4( dest->m, a->m, b->m ); +} + + + +/**********************************************************************/ +/* API functions */ +/**********************************************************************/ + + #define GET_ACTIVE_MATRIX(ctx, mat, flags, where) \ do { \ ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, where); \ @@ -972,12 +1087,9 @@ _mesa_Frustum( GLdouble left, GLdouble right, M(3,0) = 0.0F; M(3,1) = 0.0F; M(3,2) = -1.0F; M(3,3) = 0.0F; #undef M + mat_mul_floats( mat, m, MAT_FLAG_PERSPECTIVE ); - gl_mat_mul_floats( mat, m, MAT_FLAG_PERSPECTIVE ); - - - if (ctx->Transform.MatrixMode == GL_PROJECTION) - { + if (ctx->Transform.MatrixMode == GL_PROJECTION) { /* Need to keep a stack of near/far values in case the user push/pops * the projection matrix stack so that we can call Driver.NearFar() * after a pop. @@ -1006,7 +1118,8 @@ _mesa_Ortho( GLdouble left, GLdouble right, GET_ACTIVE_MATRIX( ctx, mat, ctx->NewState, "glOrtho" ); if ((left == right) || (bottom == top) || (nearval == farval)) { - gl_error( ctx, GL_INVALID_VALUE, "gl_Ortho((l = r) or (b = top) or (n=f)" ); + gl_error( ctx, GL_INVALID_VALUE, + "gl_Ortho((l = r) or (b = top) or (n=f)" ); return; } @@ -1024,7 +1137,7 @@ _mesa_Ortho( GLdouble left, GLdouble right, M(3,0) = 0.0F; M(3,1) = 0.0F; M(3,2) = 0.0F; M(3,3) = 1.0F; #undef M - gl_mat_mul_floats( mat, m, (MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION)); + mat_mul_floats( mat, m, (MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION)); if (ctx->Driver.NearFar) { (*ctx->Driver.NearFar)( ctx, nearval, farval ); @@ -1067,16 +1180,16 @@ _mesa_PushMatrix( void ) gl_error( ctx, GL_STACK_OVERFLOW, "glPushMatrix"); return; } - gl_matrix_copy( &ctx->ModelViewStack[ctx->ModelViewStackDepth++], - &ctx->ModelView ); + matrix_copy( &ctx->ModelViewStack[ctx->ModelViewStackDepth++], + &ctx->ModelView ); break; case GL_PROJECTION: if (ctx->ProjectionStackDepth >= MAX_PROJECTION_STACK_DEPTH - 1) { gl_error( ctx, GL_STACK_OVERFLOW, "glPushMatrix"); return; } - gl_matrix_copy( &ctx->ProjectionStack[ctx->ProjectionStackDepth++], - &ctx->ProjectionMatrix ); + matrix_copy( &ctx->ProjectionStack[ctx->ProjectionStackDepth++], + &ctx->ProjectionMatrix ); /* Save near and far projection values */ ctx->NearFarStack[ctx->ProjectionStackDepth][0] @@ -1091,8 +1204,8 @@ _mesa_PushMatrix( void ) gl_error( ctx, GL_STACK_OVERFLOW, "glPushMatrix"); return; } - gl_matrix_copy( &ctx->TextureStack[t][ctx->TextureStackDepth[t]++], - &ctx->TextureMatrix[t] ); + matrix_copy( &ctx->TextureStack[t][ctx->TextureStackDepth[t]++], + &ctx->TextureMatrix[t] ); } break; case GL_COLOR: @@ -1100,8 +1213,8 @@ _mesa_PushMatrix( void ) gl_error( ctx, GL_STACK_OVERFLOW, "glPushMatrix"); return; } - gl_matrix_copy( &ctx->ColorStack[ctx->ColorStackDepth++], - &ctx->ColorMatrix ); + matrix_copy( &ctx->ColorStack[ctx->ColorStackDepth++], + &ctx->ColorMatrix ); break; default: gl_problem(ctx, "Bad matrix mode in gl_PushMatrix"); @@ -1126,8 +1239,8 @@ _mesa_PopMatrix( void ) gl_error( ctx, GL_STACK_UNDERFLOW, "glPopMatrix"); return; } - gl_matrix_copy( &ctx->ModelView, - &ctx->ModelViewStack[--ctx->ModelViewStackDepth] ); + matrix_copy( &ctx->ModelView, + &ctx->ModelViewStack[--ctx->ModelViewStackDepth] ); ctx->NewState |= NEW_MODELVIEW; break; case GL_PROJECTION: @@ -1136,8 +1249,8 @@ _mesa_PopMatrix( void ) return; } - gl_matrix_copy( &ctx->ProjectionMatrix, - &ctx->ProjectionStack[--ctx->ProjectionStackDepth] ); + matrix_copy( &ctx->ProjectionMatrix, + &ctx->ProjectionStack[--ctx->ProjectionStackDepth] ); ctx->NewState |= NEW_PROJECTION; /* Device driver near/far values */ @@ -1156,8 +1269,8 @@ _mesa_PopMatrix( void ) gl_error( ctx, GL_STACK_UNDERFLOW, "glPopMatrix"); return; } - gl_matrix_copy(&ctx->TextureMatrix[t], - &ctx->TextureStack[t][--ctx->TextureStackDepth[t]]); + matrix_copy(&ctx->TextureMatrix[t], + &ctx->TextureStack[t][--ctx->TextureStackDepth[t]]); } break; case GL_COLOR: @@ -1165,8 +1278,8 @@ _mesa_PopMatrix( void ) gl_error( ctx, GL_STACK_UNDERFLOW, "glPopMatrix"); return; } - gl_matrix_copy(&ctx->ColorMatrix, - &ctx->ColorStack[--ctx->ColorStackDepth]); + matrix_copy(&ctx->ColorMatrix, + &ctx->ColorStack[--ctx->ColorStackDepth]); break; default: gl_problem(ctx, "Bad matrix mode in gl_PopMatrix"); @@ -1272,41 +1385,6 @@ _mesa_MultMatrixd( const GLdouble *m ) -/* - * Multiply a matrix by an array of floats with known properties. - */ -void gl_mat_mul_floats( GLmatrix *mat, const GLfloat *m, GLuint flags ) -{ - mat->flags |= (flags | - MAT_DIRTY_TYPE | - MAT_DIRTY_INVERSE | - MAT_DIRTY_DEPENDENTS); - - if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) - matmul34( mat->m, mat->m, m ); - else - matmul4( mat->m, mat->m, m ); - -} - -/* - * Multiply a matrix by an array of floats with known properties. - */ -void gl_mat_mul_mat( GLmatrix *mat, const GLmatrix *m ) -{ - mat->flags |= (m->flags | - MAT_DIRTY_TYPE | - MAT_DIRTY_INVERSE | - MAT_DIRTY_DEPENDENTS); - - if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) - matmul34( mat->m, mat->m, m->m ); - else - matmul4( mat->m, mat->m, m->m ); -} - - - /* * Execute a glRotate call */ @@ -1320,7 +1398,7 @@ _mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z ) GET_ACTIVE_MATRIX( ctx, mat, ctx->NewState, "glRotate" ); gl_rotation_matrix( angle, x, y, z, m ); - gl_mat_mul_floats( mat, m, MAT_FLAG_ROTATION ); + mat_mul_floats( mat, m, MAT_FLAG_ROTATION ); } } @@ -1548,83 +1626,3 @@ _mesa_DepthRange( GLclampd nearval, GLclampd farval ) (*ctx->Driver.DepthRange)( ctx, nearval, farval ); } } - - -void gl_calculate_model_project_matrix( GLcontext *ctx ) -{ - gl_matrix_mul( &ctx->ModelProjectMatrix, - &ctx->ProjectionMatrix, - &ctx->ModelView ); - - gl_matrix_analyze( &ctx->ModelProjectMatrix ); -} - - -void gl_matrix_ctr( GLmatrix *m ) -{ - if ( m->m == 0 ) { - m->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 ); - } - MEMCPY( m->m, Identity, sizeof(Identity) ); - m->inv = 0; - m->type = MATRIX_IDENTITY; - m->flags = MAT_DIRTY_DEPENDENTS; -} - -void gl_matrix_dtr( GLmatrix *m ) -{ - if ( m->m != 0 ) { - ALIGN_FREE( m->m ); - m->m = 0; - } - if ( m->inv != 0 ) { - ALIGN_FREE( m->inv ); - m->inv = 0; - } -} - -#if 0 -void gl_matrix_set_identity( GLmatrix *m ) -{ - MEMCPY( m->m, Identity, sizeof(Identity) ); - m->type = MATRIX_IDENTITY; - m->flags = MAT_DIRTY_DEPENDENTS; -} -#endif - -void gl_matrix_alloc_inv( GLmatrix *m ) -{ - if ( m->inv == 0 ) { - m->inv = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 ); - MEMCPY( m->inv, Identity, 16 * sizeof(GLfloat) ); - } -} - -void gl_matrix_copy( GLmatrix *to, const GLmatrix *from ) -{ - MEMCPY( to->m, from->m, sizeof(Identity) ); - to->flags = from->flags | MAT_DIRTY_DEPENDENTS; - to->type = from->type; - - if (to->inv != 0) { - if (from->inv == 0) { - gl_matrix_invert( to ); - } else { - MEMCPY(to->inv, from->inv, sizeof(GLfloat)*16); - } - } -} - -void gl_matrix_mul( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b ) -{ - dest->flags = (a->flags | - b->flags | - MAT_DIRTY_TYPE | - MAT_DIRTY_INVERSE | - MAT_DIRTY_DEPENDENTS); - - if (TEST_MAT_FLAGS(dest, MAT_FLAGS_3D)) - matmul34( dest->m, a->m, b->m ); - else - matmul4( dest->m, a->m, b->m ); -} diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index b142afb4613..f35af5ee1cf 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -1,10 +1,10 @@ -/* $Id: matrix.h,v 1.6 2000/06/27 22:10:00 brianp Exp $ */ +/* $Id: matrix.h,v 1.7 2000/09/17 21:56:07 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -33,11 +33,77 @@ #include "config.h" +/* Give symbolic names to some of the entries in the matrix to help + * out with the rework of the viewport_map as a matrix transform. + */ +#define MAT_SX 0 +#define MAT_SY 5 +#define MAT_SZ 10 +#define MAT_TX 12 +#define MAT_TY 13 +#define MAT_TZ 14 + + +/* + * Different kinds of 4x4 transformation matrices: + */ +#define MATRIX_GENERAL 0 /* general 4x4 matrix */ +#define MATRIX_IDENTITY 1 /* identity matrix */ +#define MATRIX_3D_NO_ROT 2 /* ortho projection and others... */ +#define MATRIX_PERSPECTIVE 3 /* perspective projection matrix */ +#define MATRIX_2D 4 /* 2-D transformation */ +#define MATRIX_2D_NO_ROT 5 /* 2-D scale & translate only */ +#define MATRIX_3D 6 /* 3-D transformation */ + +#define MAT_FLAG_IDENTITY 0 +#define MAT_FLAG_GENERAL 0x1 +#define MAT_FLAG_ROTATION 0x2 +#define MAT_FLAG_TRANSLATION 0x4 +#define MAT_FLAG_UNIFORM_SCALE 0x8 +#define MAT_FLAG_GENERAL_SCALE 0x10 +#define MAT_FLAG_GENERAL_3D 0x20 +#define MAT_FLAG_PERSPECTIVE 0x40 +#define MAT_DIRTY_TYPE 0x80 +#define MAT_DIRTY_FLAGS 0x100 +#define MAT_DIRTY_INVERSE 0x200 +#define MAT_DIRTY_DEPENDENTS 0x400 + +#define MAT_FLAGS_ANGLE_PRESERVING (MAT_FLAG_ROTATION | \ + MAT_FLAG_TRANSLATION | \ + MAT_FLAG_UNIFORM_SCALE) + +#define MAT_FLAGS_LENGTH_PRESERVING (MAT_FLAG_ROTATION | \ + MAT_FLAG_TRANSLATION) + +#define MAT_FLAGS_3D (MAT_FLAG_ROTATION | \ + MAT_FLAG_TRANSLATION | \ + MAT_FLAG_UNIFORM_SCALE | \ + MAT_FLAG_GENERAL_SCALE | \ + MAT_FLAG_GENERAL_3D) + +#define MAT_FLAGS_GEOMETRY (MAT_FLAG_GENERAL | \ + MAT_FLAG_ROTATION | \ + MAT_FLAG_TRANSLATION | \ + MAT_FLAG_UNIFORM_SCALE | \ + MAT_FLAG_GENERAL_SCALE | \ + MAT_FLAG_GENERAL_3D | \ + MAT_FLAG_PERSPECTIVE) + +#define MAT_DIRTY_ALL_OVER (MAT_DIRTY_TYPE | \ + MAT_DIRTY_DEPENDENTS | \ + MAT_DIRTY_FLAGS | \ + MAT_DIRTY_INVERSE) + +#define TEST_MAT_FLAGS(mat, a) ((MAT_FLAGS_GEOMETRY&(~(a))&((mat)->flags))==0) + + + + typedef struct { - GLfloat *m; /* 16-byte aligned */ - GLfloat *inv; /* optional, 16-byte aligned */ + GLfloat *m; /* 16-byte aligned */ + GLfloat *inv; /* optional, 16-byte aligned */ GLuint flags; - GLuint type; + GLuint type; /* one of the MATRIX_* values */ } GLmatrix; @@ -46,38 +112,38 @@ typedef struct { #endif -extern void gl_matrix_transposef( GLfloat to[16], const GLfloat from[16] ); - -extern void gl_matrix_transposed( GLdouble to[16], const GLdouble from[16] ); - - -extern void gl_rotation_matrix( GLfloat angle, GLfloat x, GLfloat y, GLfloat z, - GLfloat m[] ); - +extern void +gl_matrix_transposef( GLfloat to[16], const GLfloat from[16] ); -extern void gl_mat_mul_floats( GLmatrix *mat, const GLfloat *m, GLuint flags ); +extern void +gl_matrix_transposed( GLdouble to[16], const GLdouble from[16] ); -extern void gl_mat_mul_mat( GLmatrix *mat, const GLmatrix *mat2 ); -extern void gl_calculate_model_project_matrix( GLcontext *ctx ); +extern void +gl_rotation_matrix( GLfloat angle, GLfloat x, GLfloat y, GLfloat z, + GLfloat m[] ); -extern void gl_matrix_copy( GLmatrix *to, const GLmatrix *from ); -extern void gl_matrix_ctr( GLmatrix *m ); +extern void +gl_calculate_model_project_matrix( GLcontext *ctx ); -extern void gl_matrix_dtr( GLmatrix *m ); +extern void +gl_matrix_ctr( GLmatrix *m ); -extern void gl_matrix_alloc_inv( GLmatrix *m ); +extern void +gl_matrix_dtr( GLmatrix *m ); -extern void gl_matrix_mul( GLmatrix *dest, - const GLmatrix *a, - const GLmatrix *b ); +extern void +gl_matrix_alloc_inv( GLmatrix *m ); -extern void gl_matrix_analyze( GLmatrix *mat ); +extern void +gl_matrix_mul( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b ); -extern GLboolean gl_matrix_invert( GLmatrix *mat ); +extern void +gl_matrix_analyze( GLmatrix *mat ); -extern void gl_print_matrix( const GLmatrix *m ); +extern void +gl_print_matrix( const GLmatrix *m ); @@ -155,5 +221,4 @@ extern void _mesa_DepthRange( GLclampd nearval, GLclampd farval ); - #endif