← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/i915/i915_surface.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
https://launchpad.net/bugs/522048
[ 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:
src/gallium/drivers/i915/i915_surface.c
27
27
 
28
28
#include "i915_context.h"
29
29
#include "i915_blit.h"
30
 
#include "i915_state.h"
31
30
#include "pipe/p_defines.h"
32
 
#include "pipe/p_inlines.h"
33
 
#include "pipe/p_inlines.h"
34
 
#include "pipe/internal/p_winsys_screen.h"
35
 
#include "util/u_tile.h"
36
 
#include "util/u_rect.h"
37
31
 
38
32
 
39
33
/* Assumes all values are within bounds -- no checking at this level -