~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i965/brw_draw_upload.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
ImportĀ upstreamĀ versionĀ 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
393
393
{
394
394
   GLcontext *ctx = &brw->intel.ctx;
395
395
   struct intel_context *intel = intel_context(ctx);
396
 
   GLuint tmp = brw->vs.prog_data->inputs_read; 
 
396
   GLuint64EXT tmp = brw->vs.prog_data->inputs_read; 
397
397
   struct brw_vertex_element_packet vep;
398
398
   struct brw_array_state vbp;
399
399
   GLuint i;
414
414
    */
415
415
   
416
416
   while (tmp) {
417
 
      GLuint i = ffs(tmp)-1;
 
417
      GLuint i = ffsll(tmp)-1;
418
418
      struct brw_vertex_element *input = &brw->vb.inputs[i];
419
419
 
420
 
      tmp &= ~(1<<i);
 
420
      tmp &= ~((GLuint64EXT)1<<i);
421
421
      enabled[nr_enabled++] = input;
422
422
 
423
423
      input->index = i;
435
435
            ptr = input->glarray->Ptr;
436
436
         }
437
437
         else if (interleave != input->glarray->StrideB ||
 
438
                  (const char *)input->glarray->Ptr - (const char *)ptr < 0 ||
438
439
                  (const char *)input->glarray->Ptr - (const char *)ptr > interleave) {
439
440
            interleave = 0;
440
441
         }