diff options
| author | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
| commit | 772b25e1f366edc857e77b8c1ccdc5297d82cc41 (patch) | |
| tree | 88d38b52e80319dbd4a0c5b5e038d92f1105110a /src/glsl/ir_variable.cpp | |
| parent | ab130400cf91ab471e265e58193c95f04c7aeeda (diff) | |
| parent | b3d2ec9942303d1d03e28a25b030eb060415abfb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/glsl/ir_variable.cpp')
| -rw-r--r-- | src/glsl/ir_variable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp index 6b9b29458d0..5b8281e16e3 100644 --- a/src/glsl/ir_variable.cpp +++ b/src/glsl/ir_variable.cpp @@ -59,7 +59,7 @@ add_variable(const char *name, enum ir_variable_mode mode, int slot, */ instructions->push_tail(var); - symtab->add_variable(var->name, var); + symtab->add_variable(var); return var; } |