From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 2 Feb 2007 12:26:10 +0000 (+0000)
Subject: Merge branch 'vbo-0.2'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b59657ad965f9471574e914b861bb1d2a17d772e;p=mesa.git

Merge branch 'vbo-0.2'

Conflicts:

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

b59657ad965f9471574e914b861bb1d2a17d772e
diff --cc src/mesa/drivers/dri/i965/brw_draw_upload.c
index 08741ad90f6,feb0901d125..6150cac4aa3
--- a/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;