← 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_context.h

  • 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/mesa/drivers/dri/intel/intel_context.h
354
354
#define ALIGN(value, alignment)  ((value + alignment - 1) & ~(alignment - 1))
355
355
#define IS_POWER_OF_TWO(val) (((val) & (val - 1)) == 0)
356
356
 
357
 
static inline uint32_t
 
357
static INLINE uint32_t
358
358
U_FIXED(float value, uint32_t frac_bits)
359
359
{
360
360
   value *= (1 << frac_bits);
361
361
   return value < 0 ? 0 : value;
362
362
}
363
363
 
364
 
static inline uint32_t
 
364
static INLINE uint32_t
365
365
S_FIXED(float value, uint32_t frac_bits)
366
366
{
367
367
   return value * (1 << frac_bits);
588
588
   return (value & (value - 1)) == 0;
589
589
}
590
590
 
591
 
static inline void
 
591
static INLINE void
592
592
intel_bo_map_gtt_preferred(struct intel_context *intel,
593
593
                           drm_intel_bo *bo,
594
594
                           GLboolean write)
599
599
      drm_intel_bo_map(bo, write);
600
600
}
601
601
 
602
 
static inline void
 
602
static INLINE void
603
603
intel_bo_unmap_gtt_preferred(struct intel_context *intel,
604
604
                             drm_intel_bo *bo)
605
605
{