diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
| commit | fe9f4f49ef1c86938f75ab598d63d9ddce850f32 (patch) | |
| tree | 530c340a5ac1aa43aacdfea49f4bb1b3ffe1bce9 /src/mesa/pipe/softpipe/sp_quad_output.c | |
| parent | 18fe9776b4977af092582630b181893b2bc6de40 (diff) | |
| parent | 0a79c65073db7dbeb9a83e40a4516edcb4f25ee5 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/drivers/dri/Makefile.template
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_quad_output.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_quad_output.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/pipe/softpipe/sp_quad_output.c b/src/mesa/pipe/softpipe/sp_quad_output.c index bfd7baa946..cfe8f11808 100644 --- a/src/mesa/pipe/softpipe/sp_quad_output.c +++ b/src/mesa/pipe/softpipe/sp_quad_output.c @@ -67,8 +67,7 @@ output_quad(struct quad_stage *qs, struct quad_header *quad) static void output_begin(struct quad_stage *qs) { - if (qs->next) - qs->next->begin(qs->next); + assert(qs->next == NULL); } |