← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mesa/lucid

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/intel/intel_blit.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Timo Aaltonen, Rolf Leggewie
  • Date: 2010-03-02 17:11:31 UTC
  • mfrom: (3.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100302171131-gf6gvuqrhzoq8c8e
Tags: 7.7-4ubuntu1
https://launchpad.net/bugs/460809
https://launchpad.net/bugs/525592
[Timo Aaltonen]
* libgl1-mesa-dri: Get rid of the old hook (65mesa-check-x86-64).
  (LP: #460809)

[Rolf Leggewie]
* debian/control: depend on dpkg package where u-a supports --force
  (LP: #525592)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/intel/intel_blit.c
376
376
      GLint cx, cy, cw, ch;
377
377
      drm_clip_rect_t clear;
378
378
      int i;
 
379
      drm_intel_bo *aper_array[2];
379
380
 
380
381
      /* Get clear bounds after locking */
381
382
      cx = fb->_Xmin;
526
527
               assert(x1 < x2);
527
528
               assert(y1 < y2);
528
529
 
 
530
               /* do space check before going any further */
 
531
               aper_array[0] = intel->batch->buf;
 
532
               aper_array[1] = write_buffer;
 
533
 
 
534
               if (drm_intel_bufmgr_check_aperture_space(aper_array,
 
535
                                                         ARRAY_SIZE(aper_array)) != 0) {
 
536
                  intel_batchbuffer_flush(intel->batch);
 
537
               }
 
538
 
529
539
               BEGIN_BATCH(6, REFERENCES_CLIPRECTS);
530
540
               OUT_BATCH(CMD);
531
541
               OUT_BATCH(BR13);