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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/savage/savageioctl.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Timo Aaltonen, Robert Hooker
  • Date: 2010-02-19 15:52:12 UTC
  • mfrom: (3.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219155212-blqov938av7m6exj
Tags: 7.7-3ubuntu1
[ Timo Aaltonen ]
* Merge from Debian experimental.

[ Robert Hooker ]
* Add 100_no_abi_tag.patch: Removes the ABI tag in /usr/lib/libGL.so.1
  which prevented ldconfig from using a libGL from another directory
  at a higher priority than the one in /usr/lib.
* Install libGL alternatives with libgl1-mesa-swx11 as well. (LP: #522048)

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
 
38
38
#include "savagecontext.h"
39
39
#include "savageioctl.h"
40
 
#include "savage_bci.h"
41
40
#include "savagestate.h"
42
41
#include "savagespan.h"
43
42
 
44
43
#include "drm.h"
45
 
#include <sys/ioctl.h>
46
44
#include <sys/timeb.h>
47
45
 
48
46
#define DEPTH_SCALE_16 ((1<<16)-1)