← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/r300/r300_fragprog_common.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/mesa/drivers/dri/r300/r300_fragprog_common.c
38
38
 
39
39
#include "r300_fragprog_common.h"
40
40
 
41
 
#include "shader/program.h"
42
41
#include "shader/prog_parameter.h"
43
42
#include "shader/prog_print.h"
44
43
 
45
44
#include "compiler/radeon_compiler.h"
46
45
 
47
46
#include "radeon_mesa_to_rc.h"
48
 
#include "r300_state.h"
49
47
 
50
48
 
51
49
static GLuint build_dtm(GLuint depthmode)