diff options
| author | Brian Paul <[email protected]> | 2006-04-06 22:11:57 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-04-06 22:11:57 +0000 |
| commit | 51faca127005c41277df76bc8eafc8fd64ca0673 (patch) | |
| tree | 3ef6f2ae8f1616746e8d7316b0ca8d23267081e0 /src/mesa/tnl | |
| parent | f51a32e82a907363a77d91b855e519f43191cad8 (diff) | |
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.
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_arbshader.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_program.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_render.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_vertex.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c index 11a5b654fc9..1f492b6beb1 100644 --- 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 a2e6b37cd30..88d7f6ac8cc 100644 --- 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];
store->ormask = 0;
- store->andmask = CLIP_ALL_BITS;
+ store->andmask = CLIP_FRUSTUM_BITS;
if (tnl->NeedNdcCoords)
{
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index 06789b97baf..13db40aa603 100644 --- 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 f6e16a9f2b5..abc5429919e 100644 --- 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 e0a58aaaf3e..100fca2a226 100644 --- 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 = |