X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fmatrix.h;h=8eee67ca386de2a4f139539bb41941d1ff59eb55;hb=4807a83da0e0f5e3272e85504ee3b2213ef1910a;hp=f49a3f169373b8ddf4788995bccaa827338d4254;hpb=5e3bc0c2a2bcdf59949410f94c9b705fc1281ce8;p=mesa.git

diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index f49a3f16937..8eee67ca386 100644
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -1,10 +1,8 @@
-/* $Id: matrix.h,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.   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"),
@@ -19,9 +17,10 @@
  * 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
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -29,90 +28,86 @@
 #define MATRIX_H
 
 
-#include "mtypes.h"
-
-
-#ifdef VMS
-#define gl_calculate_model_project_matrix gl_calculate_model_project_matr
-#endif
-
-
-extern void
-gl_calculate_model_project_matrix( GLcontext *ctx );
+#include "glheader.h"
 
+struct gl_context;
 
-extern void
+extern void GLAPIENTRY
 _mesa_Frustum( GLdouble left, GLdouble right,
                GLdouble bottom, GLdouble top,
                GLdouble nearval, GLdouble farval );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Ortho( GLdouble left, GLdouble right,
              GLdouble bottom, GLdouble top,
              GLdouble nearval, GLdouble farval );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PushMatrix( void );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PopMatrix( void );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LoadIdentity( void );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LoadMatrixf( const GLfloat *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LoadMatrixd( const GLdouble *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_MatrixMode( GLenum mode );
 
-extern void
+extern void GLAPIENTRY
 _mesa_MultMatrixf( const GLfloat *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_MultMatrixd( const GLdouble *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
 
-extern void
+extern void GLAPIENTRY
 _mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
 
-extern void
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
+extern void GLAPIENTRY
+_mesa_LoadTransposeMatrixf( const GLfloat *m );
 
-extern void
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
+extern void GLAPIENTRY
+_mesa_LoadTransposeMatrixd( const GLdouble *m );
 
-extern void
-_mesa_MultTransposeMatrixfARB( const GLfloat *m );
+extern void GLAPIENTRY
+_mesa_MultTransposeMatrixf( const GLfloat *m );
 
-extern void
-_mesa_MultTransposeMatrixdARB( const GLdouble *m );
+extern void GLAPIENTRY
+_mesa_MultTransposeMatrixd( 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 );
+extern void 
+_mesa_init_matrix( struct gl_context * ctx );
+
+extern void 
+_mesa_init_transform( struct gl_context *ctx );
 
 extern void
-_mesa_DepthRange( GLclampd nearval, GLclampd farval );
+_mesa_free_matrix_data( struct gl_context *ctx );
+
+extern void 
+_mesa_update_modelview_project( struct gl_context *ctx, GLuint newstate );
 
 
 #endif