X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fmatrix.h;h=8eee67ca386de2a4f139539bb41941d1ff59eb55;hb=4807a83da0e0f5e3272e85504ee3b2213ef1910a;hp=fcc630f62a6fef9d213c30c37d5a3518a35d3166;hpb=485f04074151686fa24d40e3eeb83029d3d8c425;p=mesa.git diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index fcc630f62a6..8eee67ca386 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -1,119 +1,113 @@ -/* $Id: matrix.h,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.1 - * - * Copyright (C) 1999 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"), * 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 - * 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. */ - - - #ifndef MATRIX_H #define MATRIX_H -#include "GL/gl.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_Frustum( GLcontext *ctx, - GLdouble left, GLdouble right, - GLdouble bottom, GLdouble top, - GLdouble nearval, GLdouble farval ); - -extern void gl_Ortho( GLcontext *ctx, - GLdouble left, GLdouble right, - GLdouble bottom, GLdouble top, - GLdouble nearval, GLdouble farval ); +#include "glheader.h" -extern void gl_PushMatrix( GLcontext *ctx ); +struct gl_context; -extern void gl_PopMatrix( GLcontext *ctx ); +extern void GLAPIENTRY +_mesa_Frustum( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble nearval, GLdouble farval ); -extern void gl_LoadIdentity( GLcontext *ctx ); +extern void GLAPIENTRY +_mesa_Ortho( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble nearval, GLdouble farval ); -extern void gl_LoadMatrixf( GLcontext *ctx, const GLfloat *m ); +extern void GLAPIENTRY +_mesa_PushMatrix( void ); -extern void gl_MatrixMode( GLcontext *ctx, GLenum mode ); +extern void GLAPIENTRY +_mesa_PopMatrix( void ); -extern void gl_MultMatrixf( GLcontext *ctx, const GLfloat *m ); +extern void GLAPIENTRY +_mesa_LoadIdentity( void ); -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 GLAPIENTRY +_mesa_LoadMatrixf( const GLfloat *m ); -extern void gl_Rotatef( GLcontext *ctx, - GLfloat angle, GLfloat x, GLfloat y, GLfloat z ); +extern void GLAPIENTRY +_mesa_LoadMatrixd( const GLdouble *m ); -extern void gl_Scalef( GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z ); +extern void GLAPIENTRY +_mesa_MatrixMode( GLenum mode ); -extern void gl_Translatef( GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z ); +extern void GLAPIENTRY +_mesa_MultMatrixf( const GLfloat *m ); -extern void gl_Viewport( GLcontext *ctx, - GLint x, GLint y, GLsizei width, GLsizei height ); +extern void GLAPIENTRY +_mesa_MultMatrixd( const GLdouble *m ); -extern void gl_DepthRange( GLcontext* ctx, GLclampd nearval, GLclampd farval ); +extern void GLAPIENTRY +_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z ); +extern void GLAPIENTRY +_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z ); +extern void GLAPIENTRY +_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z ); +extern void GLAPIENTRY +_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z ); +extern void GLAPIENTRY +_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z ); -extern void gl_calculate_model_project_matrix( GLcontext *ctx ); +extern void GLAPIENTRY +_mesa_Translated( GLdouble x, GLdouble y, GLdouble z ); +extern void GLAPIENTRY +_mesa_LoadTransposeMatrixf( const GLfloat *m ); -extern void gl_matrix_ctr( GLmatrix *m ); +extern void GLAPIENTRY +_mesa_LoadTransposeMatrixd( const GLdouble *m ); -extern void gl_matrix_dtr( GLmatrix *m ); +extern void GLAPIENTRY +_mesa_MultTransposeMatrixf( const GLfloat *m ); -extern void gl_matrix_alloc_inv( GLmatrix *m ); +extern void GLAPIENTRY +_mesa_MultTransposeMatrixd( const GLdouble *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 +_mesa_init_matrix( struct gl_context * ctx ); -extern void gl_matrix_analyze( GLmatrix *mat ); +extern void +_mesa_init_transform( struct gl_context *ctx ); +extern void +_mesa_free_matrix_data( struct gl_context *ctx ); -extern void gl_MultMatrixd( GLcontext *ctx, const GLdouble *m ); -extern GLboolean gl_matrix_invert( GLmatrix *mat ); -extern void gl_print_matrix( const GLmatrix *m ); +extern void +_mesa_update_modelview_project( struct gl_context *ctx, GLuint newstate ); #endif