From f58ec215c5669f36c2649acc9cbeda7383b86879 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 21 Nov 2006 10:16:37 +0000
Subject: Gary Wong's fix for 64 bit cleanness of vertex program inputs
 bitmask.

---
 src/mesa/drivers/dri/i965/brw_draw_upload.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/drivers/dri/i965/brw_draw_upload.c')

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index cde0aa6481..57ee294f0c 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -393,7 +393,7 @@ GLboolean brw_upload_vertices( struct brw_context *brw,
 {
    GLcontext *ctx = &brw->intel.ctx;
    struct intel_context *intel = intel_context(ctx);
-   GLuint tmp = brw->vs.prog_data->inputs_read; 
+   GLuint64EXT tmp = brw->vs.prog_data->inputs_read; 
    struct brw_vertex_element_packet vep;
    struct brw_array_state vbp;
    GLuint i;
@@ -414,10 +414,10 @@ GLboolean brw_upload_vertices( struct brw_context *brw,
     */
    
    while (tmp) {
-      GLuint i = ffs(tmp)-1;
+      GLuint i = ffsll(tmp)-1;
       struct brw_vertex_element *input = &brw->vb.inputs[i];
 
-      tmp &= ~(1<<i);
+      tmp &= ~((GLuint64EXT)1<<i);
       enabled[nr_enabled++] = input;
 
       input->index = i;
-- 
cgit v1.2.3