projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vbo: bind arrays only when necessary
[mesa.git]
/
src
/
mesa
/
main
/
matrix.c
diff --git
a/src/mesa/main/matrix.c
b/src/mesa/main/matrix.c
index 8ed718cd38e3f3ef1cf790438d99dbe42f589998..76c7e1c9d1b44b2d8d94571e40e57ac48b04dc32 100644
(file)
--- a/
src/mesa/main/matrix.c
+++ b/
src/mesa/main/matrix.c
@@
-40,6
+40,7
@@
#include "context.h"
#include "enums.h"
#include "macros.h"
#include "context.h"
#include "enums.h"
#include "macros.h"
+#include "mfeatures.h"
#include "matrix.h"
#include "mtypes.h"
#include "math/m_matrix.h"
#include "matrix.h"
#include "mtypes.h"
#include "math/m_matrix.h"
@@
-59,7
+60,7
@@
*
* Flushes vertices and validates parameters. Calls _math_matrix_frustum() with
* the top matrix of the current matrix stack and sets
*
* Flushes vertices and validates parameters. Calls _math_matrix_frustum() with
* the top matrix of the current matrix stack and sets
- * __
GL
contextRec::NewState.
+ * __
struct gl_
contextRec::NewState.
*/
void GLAPIENTRY
_mesa_Frustum( GLdouble left, GLdouble right,
*/
void GLAPIENTRY
_mesa_Frustum( GLdouble left, GLdouble right,
@@
-101,7
+102,7
@@
_mesa_Frustum( GLdouble left, GLdouble right,
*
* Flushes vertices and validates parameters. Calls _math_matrix_ortho() with
* the top matrix of the current matrix stack and sets
*
* Flushes vertices and validates parameters. Calls _math_matrix_ortho() with
* the top matrix of the current matrix stack and sets
- * __
GL
contextRec::NewState.
+ * __
struct gl_
contextRec::NewState.
*/
void GLAPIENTRY
_mesa_Ortho( GLdouble left, GLdouble right,
*/
void GLAPIENTRY
_mesa_Ortho( GLdouble left, GLdouble right,
@@
-139,7
+140,7
@@
_mesa_Ortho( GLdouble left, GLdouble right,
* \sa glMatrixMode().
*
* Flushes the vertices, validates the parameter and updates
* \sa glMatrixMode().
*
* Flushes the vertices, validates the parameter and updates
- * __
GL
contextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
+ * __
struct gl_
contextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
* specified matrix stack.
*/
void GLAPIENTRY
* specified matrix stack.
*/
void GLAPIENTRY
@@
-231,7
+232,7
@@
_mesa_MatrixMode( GLenum mode )
* \sa glPushMatrix().
*
* Verifies the current matrix stack is not full, and duplicates the top-most
* \sa glPushMatrix().
*
* Verifies the current matrix stack is not full, and duplicates the top-most
- * matrix in the stack. Marks __
GL
contextRec::NewState with the stack dirty
+ * matrix in the stack. Marks __
struct gl_
contextRec::NewState with the stack dirty
* flag.
*/
void GLAPIENTRY
* flag.
*/
void GLAPIENTRY
@@
-271,7
+272,7
@@
_mesa_PushMatrix( void )
* \sa glPopMatrix().
*
* Flushes the vertices, verifies the current matrix stack is not empty, and
* \sa glPopMatrix().
*
* Flushes the vertices, verifies the current matrix stack is not empty, and
- * moves the stack head down. Marks __
GL
contextRec::NewState with the dirty
+ * moves the stack head down. Marks __
struct gl_
contextRec::NewState with the dirty
* stack flag.
*/
void GLAPIENTRY
* stack flag.
*/
void GLAPIENTRY
@@
-309,7
+310,7
@@
_mesa_PopMatrix( void )
* \sa glLoadIdentity().
*
* Flushes the vertices and calls _math_matrix_set_identity() with the top-most
* \sa glLoadIdentity().
*
* Flushes the vertices and calls _math_matrix_set_identity() with the top-most
- * matrix in the current stack. Marks __
GL
contextRec::NewState with the stack
+ * matrix in the current stack. Marks __
struct gl_
contextRec::NewState with the stack
* dirty flag.
*/
void GLAPIENTRY
* dirty flag.
*/
void GLAPIENTRY
@@
-334,7
+335,7
@@
_mesa_LoadIdentity( void )
* \sa glLoadMatrixf().
*
* Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix
* \sa glLoadMatrixf().
*
* Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix
- * in the current stack and the given matrix. Marks __
GL
contextRec::NewState
+ * in the current stack and the given matrix. Marks __
struct gl_
contextRec::NewState
* with the dirty stack flag.
*/
void GLAPIENTRY
* with the dirty stack flag.
*/
void GLAPIENTRY
@@
-365,7
+366,7
@@
_mesa_LoadMatrixf( const GLfloat *m )
*
* Flushes the vertices and calls _math_matrix_mul_floats() with the top-most
* matrix in the current stack and the given matrix. Marks
*
* Flushes the vertices and calls _math_matrix_mul_floats() with the top-most
* matrix in the current stack and the given matrix. Marks
- * __
GL
contextRec::NewState with the dirty stack flag.
+ * __
struct gl_
contextRec::NewState with the dirty stack flag.
*/
void GLAPIENTRY
_mesa_MultMatrixf( const GLfloat *m )
*/
void GLAPIENTRY
_mesa_MultMatrixf( const GLfloat *m )
@@
-397,7
+398,7
@@
_mesa_MultMatrixf( const GLfloat *m )
*
* Flushes the vertices and calls _math_matrix_rotate() with the top-most
* matrix in the current stack and the given parameters. Marks
*
* Flushes the vertices and calls _math_matrix_rotate() with the top-most
* matrix in the current stack and the given parameters. Marks
- * __
GL
contextRec::NewState with the dirty stack flag.
+ * __
struct gl_
contextRec::NewState with the dirty stack flag.
*/
void GLAPIENTRY
_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
*/
void GLAPIENTRY
_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
@@
-422,7
+423,7
@@
_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
*
* Flushes the vertices and calls _math_matrix_scale() with the top-most
* matrix in the current stack and the given parameters. Marks
*
* Flushes the vertices and calls _math_matrix_scale() with the top-most
* matrix in the current stack and the given parameters. Marks
- * __
GL
contextRec::NewState with the dirty stack flag.
+ * __
struct gl_
contextRec::NewState with the dirty stack flag.
*/
void GLAPIENTRY
_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
*/
void GLAPIENTRY
_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
@@
-445,7
+446,7
@@
_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
*
* Flushes the vertices and calls _math_matrix_translate() with the top-most
* matrix in the current stack and the given parameters. Marks
*
* Flushes the vertices and calls _math_matrix_translate() with the top-most
* matrix in the current stack and the given parameters. Marks
- * __
GL
contextRec::NewState with the dirty stack flag.
+ * __
struct gl_
contextRec::NewState with the dirty stack flag.
*/
void GLAPIENTRY
_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
*/
void GLAPIENTRY
_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
@@
-559,13
+560,13
@@
_mesa_MultTransposeMatrixdARB( const GLdouble *m )
* Calls _math_matrix_analyse() with the top-matrix of the projection matrix
* stack, and recomputes user clip positions if necessary.
*
* Calls _math_matrix_analyse() with the top-matrix of the projection matrix
* stack, and recomputes user clip positions if necessary.
*
- * \note This routine references __
GL
contextRec::Tranform attribute values to
+ * \note This routine references __
struct gl_
contextRec::Tranform attribute values to
* compute userclip positions in clip space, but is only called on
* _NEW_PROJECTION. The _mesa_ClipPlane() function keeps these values up to
* compute userclip positions in clip space, but is only called on
* _NEW_PROJECTION. The _mesa_ClipPlane() function keeps these values up to
- * date across changes to the __
GL
contextRec::Transform attributes.
+ * date across changes to the __
struct gl_
contextRec::Transform attributes.
*/
static void
*/
static void
-update_projection(
GL
context *ctx )
+update_projection(
struct gl_
context *ctx )
{
_math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
{
_math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
@@
-593,11
+594,11
@@
update_projection( GLcontext *ctx )
* \param ctx GL context.
*
* Multiplies the top matrices of the projection and model view stacks into
* \param ctx GL context.
*
* Multiplies the top matrices of the projection and model view stacks into
- * __
GL
contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
+ * __
struct gl_
contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
* analyzes the resulting matrix via _math_matrix_analyse().
*/
static void
* analyzes the resulting matrix via _math_matrix_analyse().
*/
static void
-calculate_model_project_matrix(
GL
context *ctx )
+calculate_model_project_matrix(
struct gl_
context *ctx )
{
_math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
ctx->ProjectionMatrixStack.Top,
{
_math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
ctx->ProjectionMatrixStack.Top,
@@
-618,7
+619,7
@@
calculate_model_project_matrix( GLcontext *ctx )
* calculate_model_project_matrix() to recalculate the modelview-projection
* matrix.
*/
* calculate_model_project_matrix() to recalculate the modelview-projection
* matrix.
*/
-void _mesa_update_modelview_project(
GL
context *ctx, GLuint new_state )
+void _mesa_update_modelview_project(
struct gl_
context *ctx, GLuint new_state )
{
if (new_state & _NEW_MODELVIEW) {
_math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
{
if (new_state & _NEW_MODELVIEW) {
_math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
@@
-712,7
+713,7
@@
free_matrix_stack( struct gl_matrix_stack *stack )
* Initializes each of the matrix stacks and the combined modelview-projection
* matrix.
*/
* Initializes each of the matrix stacks and the combined modelview-projection
* matrix.
*/
-void _mesa_init_matrix(
GL
context * ctx )
+void _mesa_init_matrix(
struct gl_
context * ctx )
{
GLint i;
{
GLint i;
@@
-742,7
+743,7
@@
void _mesa_init_matrix( GLcontext * ctx )
* Frees each of the matrix stacks and the combined modelview-projection
* matrix.
*/
* Frees each of the matrix stacks and the combined modelview-projection
* matrix.
*/
-void _mesa_free_matrix_data(
GL
context *ctx )
+void _mesa_free_matrix_data(
struct gl_
context *ctx )
{
GLint i;
{
GLint i;
@@
-765,7
+766,7
@@
void _mesa_free_matrix_data( GLcontext *ctx )
*
* \todo Move this to a new file with other 'transform' routines.
*/
*
* \todo Move this to a new file with other 'transform' routines.
*/
-void _mesa_init_transform(
GL
context *ctx )
+void _mesa_init_transform(
struct gl_
context *ctx )
{
GLint i;
{
GLint i;