diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-07 08:37:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-07 08:37:48 +0200 |
| commit | dbe01a4f78f09723b327d1d8522bfa5026c4f6e0 (patch) | |
| tree | 8b770c826cf9f64cb61ff3efd1c2f01aeb2dc8c9 /mesalib/src/glsl/ir_function.cpp | |
| parent | d5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826 (diff) | |
| parent | 47a6ae678489d7082b5d7da35d1a92b4233fb5eb (diff) | |
| download | vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.gz vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.bz2 vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/ir_print_visitor.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/opt_constant_propagation.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
Diffstat (limited to 'mesalib/src/glsl/ir_function.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_function.cpp b/mesalib/src/glsl/ir_function.cpp index ef8d4fcfc..1255072a5 100644 --- a/mesalib/src/glsl/ir_function.cpp +++ b/mesalib/src/glsl/ir_function.cpp @@ -165,7 +165,7 @@ ir_function_signature * ir_function::matching_signature(const exec_list *actual_parameters) { ir_function_signature *match = NULL; - int matched_score; + int matched_score = 0; foreach_iter(exec_list_iterator, iter, signatures) { ir_function_signature *const sig = |