summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/clip.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-03-19 14:17:41 -0600
committerBrian <brian@ubuntu10-32.(none)>2011-03-19 14:17:41 -0600
commitec4a21b0e21e8c706f26db5308fb267b6979b631 (patch)
tree7a05745f3d393b902ba57979eb8463945c10d225 /src/mesa/main/clip.c
parent957552fce0c272b476d89bee374724e8a94a8d8a (diff)
downloadexternal_mesa3d-ec4a21b0e21e8c706f26db5308fb267b6979b631.zip
external_mesa3d-ec4a21b0e21e8c706f26db5308fb267b6979b631.tar.gz
external_mesa3d-ec4a21b0e21e8c706f26db5308fb267b6979b631.tar.bz2
mesa: consolidate clip plane update code
Diffstat (limited to 'src/mesa/main/clip.c')
-rw-r--r--src/mesa/main/clip.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index be8ce42..ba2028c 100644
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -32,11 +32,20 @@
#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
@@ -78,17 +87,8 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
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 (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))
- _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)