summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/draw/draw_prim.c
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-08-24 11:05:31 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-08-24 11:06:13 -0600
commitf9a77a3080598d03c484fa5d04c213b8a06d43d3 (patch)
treedd20a620dd775bc4b8c10eebadf9869f78665ee9 /src/mesa/pipe/draw/draw_prim.c
parent6a13caec093dc86fbce80c9f78426d39e9b4276b (diff)
Fix user-defined clip planes. They seem to work properly now.
The bits for the N user-defined planes are now set in the vertex_header->clipmask. See some detailed comments about this in the clip_line() function. CLIP_USER_BIT no longer exists.
Diffstat (limited to 'src/mesa/pipe/draw/draw_prim.c')
-rw-r--r--src/mesa/pipe/draw/draw_prim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/pipe/draw/draw_prim.c b/src/mesa/pipe/draw/draw_prim.c
index 309017cc60..2d613754e8 100644
--- a/src/mesa/pipe/draw/draw_prim.c
+++ b/src/mesa/pipe/draw/draw_prim.c
@@ -248,7 +248,7 @@ run_vertex_program(struct draw_context *draw,
z = vOut[j]->clip[2] = machine.Outputs[0].xyzw[2].f[j];
w = vOut[j]->clip[3] = machine.Outputs[0].xyzw[3].f[j];
- vOut[j]->clipmask = compute_clipmask(x, y, z, w);
+ vOut[j]->clipmask = compute_clipmask(x, y, z, w) | draw->user_clipmask;
vOut[j]->edgeflag = 1;
/* divide by w */