← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to fb/fbblt.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
fb/fbblt.c
27
27
#include <dix-config.h>
28
28
#endif
29
29
 
 
30
#include <string.h>
30
31
#include "fb.h"
31
32
 
32
33
#define InitializeShifts(sx,dx,ls,rs) { \
77
78
        return;
78
79
    }
79
80
#endif
 
81
 
 
82
    if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
 
83
            !(srcX & 7) && !(dstX & 7) && !(width & 7)) {
 
84
        int i;
 
85
        CARD8 *src = (CARD8 *) srcLine;
 
86
        CARD8 *dst = (CARD8 *) dstLine;
 
87
        
 
88
        srcStride *= sizeof(FbBits);
 
89
        dstStride *= sizeof(FbBits);
 
90
        width >>= 3;
 
91
        src += (srcX >> 3);
 
92
        dst += (dstX >> 3);
 
93
 
 
94
        if (!upsidedown)
 
95
            for (i = 0; i < height; i++)
 
96
                memcpy(dst + i * dstStride, src + i * srcStride, width);
 
97
        else
 
98
            for (i = height - 1; i >= 0; i--)
 
99
                memcpy(dst + i * dstStride, src + i * srcStride, width);
 
100
 
 
101
        return;
 
102
    }
 
103
 
80
104
    FbInitializeMergeRop(alu, pm);
81
105
    destInvarient = FbDestInvarientMergeRop();
82
106
    if (upsidedown)