aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ir_print_visitor.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-29 20:46:21 +0200
committermarha <marha@users.sourceforge.net>2014-05-29 20:46:21 +0200
commit816a5430313e07083c5325f0a430126a2e10ec41 (patch)
tree82e47992f52149b83238690062e0c56202cb2ebb /mesalib/src/glsl/ir_print_visitor.cpp
parentc2dfa0e8c98b06e050c530d704d75a7e4edad02e (diff)
downloadvcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.gz
vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.bz2
vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.zip
mesa xkeyboard-config git update 29 Mar 2014
xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
Diffstat (limited to 'mesalib/src/glsl/ir_print_visitor.cpp')
-rw-r--r--mesalib/src/glsl/ir_print_visitor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index 0a7695ae1..c4a6f9c9f 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -146,7 +146,7 @@ print_type(FILE *f, const glsl_type *t)
print_type(f, t->fields.array);
fprintf(f, " %u)", t->length);
} else if ((t->base_type == GLSL_TYPE_STRUCT)
- && (strncmp("gl_", t->name, 3) != 0)) {
+ && !is_gl_identifier(t->name)) {
fprintf(f, "%s@%p", t->name, (void *) t);
} else {
fprintf(f, "%s", t->name);
@@ -430,7 +430,7 @@ void ir_print_visitor::visit(ir_constant *ir)
case GLSL_TYPE_FLOAT:
if (ir->value.f[i] == 0.0f)
/* 0.0 == -0.0, so print with %f to get the proper sign. */
- fprintf(f, "%.1f", ir->value.f[i]);
+ fprintf(f, "%f", ir->value.f[i]);
else if (fabs(ir->value.f[i]) < 0.000001f)
fprintf(f, "%a", ir->value.f[i]);
else if (fabs(ir->value.f[i]) > 1000000.0f)