← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/x11/xm_span.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:
src/mesa/drivers/x11/xm_span.c
1453
1453
                  pixel &= 0x00ffffff;
1454
1454
                  pixel |= rgba[i][BCOMP] << 24;
1455
1455
                  *ptr4++ = pixel;
1456
 
                  pixel = *ptr4 && 0xffff0000;
 
1456
                  pixel = *ptr4 & 0xffff0000;
1457
1457
                  pixel |= rgba[i][GCOMP];
1458
1458
                  pixel |= rgba[i][RCOMP] << 8;
1459
1459
                  *ptr4 = pixel;
1463
1463
                  pixel |= rgba[i][BCOMP] << 16;
1464
1464
                  pixel |= rgba[i][GCOMP] << 24;
1465
1465
                  *ptr4++ = pixel;
1466
 
                  pixel = *ptr4 && 0xffffff00;
 
1466
                  pixel = *ptr4 & 0xffffff00;
1467
1467
                  pixel |= rgba[i][RCOMP];
1468
1468
                  *ptr4 = pixel;
1469
1469
                  break;
1493
1493
            pixel &= 0x00ffffff;
1494
1494
            pixel |= rgba[i][BCOMP] << 24;
1495
1495
            *ptr4++ = pixel;
1496
 
            pixel = *ptr4 && 0xffff0000;
 
1496
            pixel = *ptr4 & 0xffff0000;
1497
1497
            pixel |= rgba[i][GCOMP];
1498
1498
            pixel |= rgba[i++][RCOMP] << 8;
1499
1499
            *ptr4 = pixel;
1504
1504
            pixel |= rgba[i][BCOMP] << 16;
1505
1505
            pixel |= rgba[i][GCOMP] << 24;
1506
1506
            *ptr4++ = pixel;
1507
 
            pixel = *ptr4 && 0xffffff00;
 
1507
            pixel = *ptr4 & 0xffffff00;
1508
1508
            pixel |= rgba[i++][RCOMP];
1509
1509
            *ptr4 = pixel;
1510
1510
            if (0 == --w)