Minor tweaks to help out at a driver level.

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

diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 700d271f7bda9b3cbd391cdf1574390c9a5d56e1..31e6af91bd1a99f8361d8478590d0de1788723a0 100644 (file)
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -1,8 +1,7 @@
-/* $Id: clip.c,v 1.24 2001/12/18 04:06:44 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
@@ -25,19 +24,14 @@
  */
 
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
 #include "glheader.h"
 #include "clip.h"
 #include "context.h"
 #include "macros.h"
-#include "mmath.h"
 #include "mtypes.h"
 
 #include "math/m_xform.h"
 #include "math/m_matrix.h"
-#endif
 
 
 
@@ -47,7 +41,7 @@
 
 
 
-void
+void GLAPIENTRY
 _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -90,9 +84,9 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * matrix, and is recalculated on changes to the projection matrix by
     * code in _mesa_update_state().
     */
-   if (ctx->Transform.ClipEnabled[p]) {
+   if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
       if (ctx->ProjectionMatrixStack.Top->flags & MAT_DIRTY)
-        _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
+         _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
       _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
                           ctx->Transform.EyeUserPlane[p],
@@ -104,7 +98,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
 }
 
 
-void
+void GLAPIENTRY
 _mesa_GetClipPlane( GLenum plane, GLdouble *equation )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -122,3 +116,4 @@ _mesa_GetClipPlane( GLenum plane, GLdouble *equation )
    equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];
    equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];
 }
+