Rename CLIP_ALL_BITS to CLIP_FRUSTUM_BITS to reflect the fact that the value

only includes the 6 frustum bits, not the user-clip plane bit, nor the vertex
cull bit.

diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index 334f3ef030219b8689ab70f1156e9970c8491580..ab288183597af0314b117f7537525ed1f6a59331 100644 (file)
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -245,7 +245,7 @@ static int test_cliptest_function( clip_func func, int np,
    ref->flags = 0;
 
    dco = rco = 0;
-   dca = rca = CLIP_ALL_BITS;
+   dca = rca = CLIP_FRUSTUM_BITS;
 
    ref_cliptest[psize]( source, ref, rm, &rco, &rca );
 

diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index 63f1062fc85a69e95e383d1d27812eaf208a5878..99b071a46b6bc3a07f00551be3aa1fc187bf9eb2 100644 (file)
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -99,7 +99,7 @@ _math_init_transformation(void);
 #define CLIP_FAR_BIT     0x20
 #define CLIP_USER_BIT    0x40
 #define CLIP_CULL_BIT    0x80
-#define CLIP_ALL_BITS    0x3f
+#define CLIP_FRUSTUM_BITS    0x3f
 
 
 typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip,

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 11a5b654fc97bbe3dad0ff53c6a62eb97b35d084..1f492b6beb1da4944ea126524ad3b2b1b882cf87 100644 (file)
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1193,7 +1193,7 @@ do_ndc_cliptest(GLcontext *ctx, struct arb_vp_machine *m)
     * the clipmask.
     */
    m->ormask = 0;
-   m->andmask = CLIP_ALL_BITS;
+   m->andmask = CLIP_FRUSTUM_BITS;
 
    if (tnl->NeedNdcCoords) {
       VB->NdcPtr =

diff --git a/src/mesa/tnl/t_vb_arbshader.c b/src/mesa/tnl/t_vb_arbshader.c
index a2e6b37cd3082037491acc35d9567733400a0a09..88d7f6ac8ccd1909e21360abe5407f37ea1d5146 100644 (file)
--- a/src/mesa/tnl/t_vb_arbshader.c
+++ b/src/mesa/tnl/t_vb_arbshader.c
@@ -227,7 +227,7 @@ static GLboolean run_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stag
        vb->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->outputs[VERT_RESULT_PSIZ];\r
 \r
        store->ormask = 0;\r
-       store->andmask = CLIP_ALL_BITS;\r
+       store->andmask = CLIP_FRUSTUM_BITS;\r
 \r
        if (tnl->NeedNdcCoords)\r
        {\r

diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 06789b97baf63eb28782901fab083ab650b56f6e..13db40aa603ec844c58fe9f0aaba36772337aea5 100644 (file)
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -176,7 +176,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
     * the clipmask.
     */
    store->ormask = 0;
-   store->andmask = CLIP_ALL_BITS;
+   store->andmask = CLIP_FRUSTUM_BITS;
 
    if (tnl->NeedNdcCoords) {
       VB->NdcPtr =

diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index f6e16a9f2b5cd5974393aecdae3ba7d2e2f70367..abc5429919e6070d336ca7f6e5f69338b5b74008 100644 (file)
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -73,7 +73,8 @@
 #define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val
 
 
-#define CLIPMASK (CLIP_ALL_BITS|CLIP_CULL_BIT)
+/* This does NOT include the CLIP_USER_BIT! */
+#define CLIPMASK (CLIP_FRUSTUM_BITS | CLIP_CULL_BIT)
 
 
 /* Vertices, with the possibility of clipping.
@@ -85,6 +86,7 @@
 do {                                           \
    GLubyte c1 = mask[v1], c2 = mask[v2];       \
    GLubyte ormask = c1|c2;                     \
+   printf("0x%x 0x%x 0x%x\n", c1, c2, CLIPMASK);\
    if (!ormask)                                        \
       LineFunc( ctx, v1, v2 );                 \
    else if (!(c1 & c2 & CLIPMASK))                     \

diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index e0a58aaaf3e2b47b916a45d5779b9dce3f73567a..100fca2a2266669969c0625cfa3a19e4c5fed6fe 100644 (file)
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -168,7 +168,7 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
     * the clipmask.
     */
    store->ormask = 0;
-   store->andmask = CLIP_ALL_BITS;
+   store->andmask = CLIP_FRUSTUM_BITS;
 
    if (tnl->NeedNdcCoords) {
       VB->NdcPtr =