Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index 53fd29aa31cf34c7b9802f9d6ad229fb66f25dc3..38fd235b117e347e60acd847b045a650434e17e6 100644 (file)
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -1,10 +1,9 @@
-/* $Id: matrix.h,v 1.11 2001/03/03 20:33:27 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.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"),
@@ -32,78 +31,82 @@
 #include "mtypes.h"
 
 
-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
+extern void GLAPIENTRY
 _mesa_LoadTransposeMatrixfARB( const GLfloat *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_LoadTransposeMatrixdARB( const GLdouble *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_MultTransposeMatrixfARB( const GLfloat *m );
 
-extern void
+extern void GLAPIENTRY
 _mesa_MultTransposeMatrixdARB( const GLdouble *m );
 
-extern void
-_mesa_Viewport( GLint x, GLint y, GLsizei width, GLsizei height );
 
-extern void
-_mesa_set_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