diff options
| author | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2009-12-07 18:13:57 -0500 |
| commit | 45412c2343a3ed1de388aca6a5ae25c49918c9bc (patch) | |
| tree | 44303c67e10949cad86ed1bf1fe818c397288e7b /progs/glsl/bump.c | |
| parent | 9b5f260756356a73984d60c907c525b8a2f8cf94 (diff) | |
| parent | cad14c2542698de144bb5434cefa02d7a00aaa74 (diff) | |
Merge remote branch 'origin/master' into arb_geometry_shader4arb_geometry_shader4
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/enums.c
src/mesa/main/remap_helper.h
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_program.h
Diffstat (limited to 'progs/glsl/bump.c')
| -rw-r--r-- | progs/glsl/bump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/glsl/bump.c b/progs/glsl/bump.c index 87669aec73..50a0900f1c 100644 --- a/progs/glsl/bump.c +++ b/progs/glsl/bump.c @@ -36,7 +36,7 @@ static GLint win = 0; static GLfloat xRot = 20.0f, yRot = 0.0f, zRot = 0.0f; -static GLuint tangentAttrib; +static GLint tangentAttrib; static GLboolean Anim = GL_FALSE; |