swrast: fix secondary color add for glBitmap
authorBrian Paul <brianp@vmware.com>
Mon, 6 Apr 2009 23:17:52 +0000 (17:17 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 6 Apr 2009 23:18:58 +0000 (17:18 -0600)
commit76ac75af8e5481b498981c133836efa2101be2dc
tree6c76e0be55e7a6c3a4c5b458ebb2aeeed51e0146
parentb4c0e1f9e16ba61acd781ed6cbe448460e2b3153
swrast: fix secondary color add for glBitmap

Also, clean up the logic involved in choosing per-vertex vs. per-fragment
primary+secondary color addition.
src/mesa/swrast/s_context.c
src/mesa/swrast/s_context.h
src/mesa/swrast/s_span.c