Added few more stubs so that control reaches to DestroyDevice().

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

diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index a1eda32ebf73230e949b4318def61d7bfe2efd37..0950283ff3c6953cdba750d1561b5795a8a02921 100644 (file)
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -1,9 +1,7 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  Brian Paul   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"),
@@ -18,9 +16,10 @@
  * 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.
  */
 
 
@@ -30,15 +29,23 @@
 #include "macros.h"
 #include "mtypes.h"
 
-#include "math/m_xform.h"
 #include "math/m_matrix.h"
 
 
+/**
+ * Update derived clip plane state.
+ */
+void
+_mesa_update_clip_plane(struct gl_context *ctx, GLuint plane)
+{
+   if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))
+      _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
-/**********************************************************************/
-/*                     Get/Set User clip-planes.                      */
-/**********************************************************************/
-
+   /* Clip-Space Plane = Eye-Space Plane * Projection Matrix */
+   _mesa_transform_vector(ctx->Transform._ClipUserPlane[plane],
+                          ctx->Transform.EyeUserPlane[plane],
+                          ctx->ProjectionMatrixStack.Top->inv);
+}
 
 
 void GLAPIENTRY
@@ -47,7 +54,6 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
    GET_CURRENT_CONTEXT(ctx);
    GLint p;
    GLfloat equation[4];
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    p = (GLint) plane - (GLint) GL_CLIP_PLANE0;
    if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
@@ -68,7 +74,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
     * clipping now takes place.  The clip-space equations are recalculated
     * whenever the projection matrix changes.
     */
-   if (ctx->ModelviewMatrixStack.Top->flags & MAT_DIRTY)
+   if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))
       _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
 
    _mesa_transform_vector( equation, equation,
@@ -77,20 +83,13 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
    if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation))
       return;
 
+   /* EyeUserPlane is used by program state constants. */
    FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
+   ctx->NewDriverState |= ctx->DriverFlags.NewClipPlane;
    COPY_4FV(ctx->Transform.EyeUserPlane[p], equation);
 
-   /* Update derived state.  This state also depends on the projection
-    * matrix, and is recalculated on changes to the projection matrix by
-    * code in _mesa_update_state().
-    */
    if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-      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->ProjectionMatrixStack.Top->inv );
+      _mesa_update_clip_plane(ctx, p);
    }
 
    if (ctx->Driver.ClipPlane)
@@ -103,7 +102,6 @@ _mesa_GetClipPlane( GLenum plane, GLdouble *equation )
 {
    GET_CURRENT_CONTEXT(ctx);
    GLint p;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    p = (GLint) (plane - GL_CLIP_PLANE0);
    if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
@@ -116,46 +114,3 @@ _mesa_GetClipPlane( GLenum plane, GLdouble *equation )
    equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];
    equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];
 }
-
-void GLAPIENTRY 
-_mesa_CullParameterfvEXT (GLenum cap, GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (cap) {
-   case GL_CULL_VERTEX_EYE_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullEyePos, v);
-      
-      _mesa_transform_vector( ctx->Transform.CullObjPos, 
-                             ctx->Transform.CullEyePos,
-                             ctx->ModelviewMatrixStack.Top->inv );
-      break;
-
-   case GL_CULL_VERTEX_OBJECT_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullObjPos, v);
-
-      _mesa_transform_vector( ctx->Transform.CullEyePos, 
-                             ctx->Transform.CullObjPos,
-                             ctx->ModelviewMatrixStack.Top->m );
-     break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glCullParameterfvEXT" );
-   }
-}
-
-void GLAPIENTRY 
-_mesa_CullParameterdvEXT (GLenum cap, GLdouble *v)
-{
-   GLfloat f[4];
-   
-   f[0] = (GLfloat)v[0];
-   f[1] = (GLfloat)v[1];
-   f[2] = (GLfloat)v[2];
-   f[3] = (GLfloat)v[3];
-
-   _mesa_CullParameterfvEXT(cap, f);
-}
-