aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-05 16:04:18 +0200
committermarha <marha@users.sourceforge.net>2011-06-05 16:04:18 +0200
commit097c0d8400d976c5c372db576a11764e87994c7f (patch)
treeb5f977f9277f70f94f22ef221602ed318592a912 /mesalib/src/glsl
parent03fa24f76277662240d0af8770e168fc38b533cb (diff)
parent0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff)
downloadvcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.gz
vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.bz2
vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r--mesalib/src/glsl/glsl_parser_extras.cpp2
-rw-r--r--mesalib/src/glsl/ir_print_visitor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index 8de806d4d..809e6d174 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -436,7 +436,7 @@ ast_expression::print(void) const
printf("? ");
subexpressions[1]->print();
printf(": ");
- subexpressions[1]->print();
+ subexpressions[2]->print();
break;
case ast_array_index:
diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index ba95103ea..cabb2f6cc 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -370,7 +370,7 @@ void ir_print_visitor::visit(ir_constant *ir)
} else if (ir->type->is_record()) {
ir_constant *value = (ir_constant *) ir->components.get_head();
for (unsigned i = 0; i < ir->type->length; i++) {
- printf("(%s ", ir->type->fields.structure->name);
+ printf("(%s ", ir->type->fields.structure[i].name);
value->accept(this);
printf(")");