← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to hw/xfree86/dri2/dri2ext.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/dri2/dri2ext.c
80
80
    rep.type = X_Reply;
81
81
    rep.length = 0;
82
82
    rep.sequenceNumber = client->sequence;
83
 
    rep.majorVersion = SERVER_DRI2_MAJOR_VERSION;
84
 
    rep.minorVersion = SERVER_DRI2_MINOR_VERSION;
 
83
    rep.majorVersion = dri2_major;
 
84
    rep.minorVersion = dri2_minor;
85
85
 
86
86
    if (client->swapped) {
87
87
        swaps(&rep.sequenceNumber, n);
384
384
                       DixReadAccess | DixWriteAccess, &pDrawable, &status))
385
385
        return status;
386
386
 
 
387
    /*
 
388
     * Ensures an out of control client can't exhaust our swap queue, and
 
389
     * also orders swaps.
 
390
     */
 
391
    if (DRI2ThrottleClient(client, pDrawable))
 
392
        return client->noClientException;
 
393
 
387
394
    target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
388
395
    divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
389
396
    remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);