← Back to branch summary

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

« back to all changes in this revision

Viewing changes to progs/glsl/vert-tex.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:
progs/glsl/vert-tex.c
40
40
static GLboolean WireFrame = GL_TRUE;
41
41
static GLfloat xRot = -70.0f, yRot = 0.0f, zRot = 0.0f;
42
42
 
43
 
 
44
 
/* value[0] = tex unit */
45
 
static struct uniform_info Uniforms[] = {
46
 
   { "tex1",  1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 },
47
 
   END_OF_UNIFORMS
48
 
};
49
 
 
50
 
 
51
 
 
52
43
static void
53
44
Idle(void)
54
45
{