fixed pointer arithmetic error in glCopyPixels

[mesa.git] / src / mesa / main / clip.c

diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 026d3e5695d19103dba78fc9c6df39a6e7460bd8..700d271f7bda9b3cbd391cdf1574390c9a5d56e1 100644 (file)
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -1,4 +1,4 @@
-/* $Id: clip.c,v 1.22 2001/03/12 00:48:37 gareth Exp $ */
+/* $Id: clip.c,v 1.24 2001/12/18 04:06:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -41,9 +41,6 @@
 
 
 
-
-
-
 /**********************************************************************/
 /*                     Get/Set User clip-planes.                      */
 /**********************************************************************/
@@ -64,10 +61,10 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
       return;
    }
 
-   equation[0] = eq[0];
-   equation[1] = eq[1];
-   equation[2] = eq[2];
-   equation[3] = eq[3];
+   equation[0] = (GLfloat) eq[0];
+   equation[1] = (GLfloat) eq[1];
+   equation[2] = (GLfloat) eq[2];
+   equation[3] = (GLfloat) eq[3];
 
    /*
     * The equation is transformed by the transpose of the inverse of the
@@ -77,10 +74,11 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * clipping now takes place.  The clip-space equations are recalculated
     * whenever the projection matrix changes.
     */
-   if (ctx->ModelView.flags & MAT_DIRTY)
-      _math_matrix_analyse( &ctx->ModelView );
+   if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY)
+      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
 
-   _mesa_transform_vector( equation, equation, ctx->ModelView.inv );
+   _mesa_transform_vector( equation, equation,
+                           ctx->ModelviewMatrixStack.Top->inv );
 
    if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation))
       return;
@@ -93,12 +91,12 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * code in _mesa_update_state().
     */
    if (ctx->Transform.ClipEnabled[p]) {
-      if (ctx->ProjectionMatrix.flags & MAT_DIRTY)
-        _math_matrix_analyse( &ctx->ProjectionMatrix );
+      if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY)
+        _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
       _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
                           ctx->Transform.EyeUserPlane[p],
-                          ctx->ProjectionMatrix.inv );
+                          ctx->ProjectionMatrixStack.Top->inv );
    }
 
    if (ctx->Driver.ClipPlane)