Comment out __FUNCTION__ usage.

[mesa.git] / src / mesa / main / matrix.h

diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index e8c79e2c595fb55ea6783c24be5ff1cf94c97de6..59c0a6fad4f5bd91c5b7ca32c9e9d3f6d05ec742 100644 (file)
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -1,21 +1,21 @@
-/* $Id: matrix.h,v 1.4 1999/11/12 18:10:47 brianp Exp $ */
+/* $Id: matrix.h,v 1.12 2001/03/12 00:48:38 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,51 +29,7 @@
 #define MATRIX_H
 
 
-#include "types.h"
-#include "config.h"
-
-
-typedef struct {
-   GLfloat m[16];
-   GLfloat *inv;               /* optional */
-   GLuint flags;
-   GLuint type;
-} GLmatrix;
-
-
-#ifdef VMS
-#define gl_calculate_model_project_matrix gl_calculate_model_project_matr
-#endif
-
-
-extern void gl_rotation_matrix( GLfloat angle, GLfloat x, GLfloat y, GLfloat z,
-                                GLfloat m[] );
-
-
-extern void gl_mat_mul_floats( GLmatrix *mat, const GLfloat *m, GLuint flags );
-
-extern void gl_mat_mul_mat( GLmatrix *mat, const GLmatrix *mat2 );
-
-extern void gl_calculate_model_project_matrix( GLcontext *ctx );
-
-extern void gl_matrix_ctr( GLmatrix *m );
-
-extern void gl_matrix_dtr( GLmatrix *m );
-
-extern void gl_matrix_alloc_inv( GLmatrix *m );
-
-extern void gl_matrix_copy( GLmatrix *to, const GLmatrix *from );
-
-extern void gl_matrix_mul( GLmatrix *dest, 
-                          const GLmatrix *a, 
-                          const GLmatrix *b );
-
-extern void gl_matrix_analyze( GLmatrix *mat );
-
-extern GLboolean gl_matrix_invert( GLmatrix *mat );
-
-extern void gl_print_matrix( const GLmatrix *m );
-
+#include "mtypes.h"
 
 
 extern void
@@ -128,15 +84,26 @@ _mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
 extern void
 _mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
 
+extern void
+_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
+
+extern void
+_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
+
+extern void
+_mesa_MultTransposeMatrixfARB( const GLfloat *m );
+
+extern void
+_mesa_MultTransposeMatrixdARB( const GLdouble *m );
+
 extern void
 _mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height );
 
 extern void
-gl_Viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
+_mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height );
 
 extern void
 _mesa_DepthRange( GLclampd nearval, GLclampd farval );
 
 
-
 #endif