Merge branch 'vbo-0.2'

Conflicts:

	src/mesa/main/texcompress_s3tc.c
	src/mesa/tnl/t_array_api.c

diff --cc src/mesa/drivers/directfb/idirectfbgl_mesa.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
index 08741ad90f6b19307e306245cd469b726495a38e,feb0901d125ce5a21e68f56d1a444ac3342e6530..6150cac4aa3b4d64e340f87e1627c9250e88798e
--- 1/src/mesa/drivers/dri/i965/brw_draw_upload.c
--- 2/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@@ -412,12 -408,14 +408,14 @@@ GLboolean brw_upload_vertices( struct b
  
     /* First build an array of pointers to ve's in vb.inputs_read
      */
+    if (0)
+       _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
     
     while (tmp) {
 -      GLuint i = ffsll(tmp)-1;
 +      GLuint i = _mesa_ffsll(tmp)-1;
        struct brw_vertex_element *input = &brw->vb.inputs[i];
  
-       tmp &= ~((GLuint64EXT)1<<i);
+       tmp &= ~(1<<i);
        enabled[nr_enabled++] = input;
  
        input->index = i;

diff --cc src/mesa/drivers/dri/i965/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/nouveau/nouveau_context.c
Simple merge

diff --cc src/mesa/drivers/dri/nouveau/nouveau_state.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_context.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_render.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge

diff --cc src/mesa/drivers/x11/xm_api.c
Simple merge

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/dlist.c
Simple merge