Merge pull request aras-p#3 from cmcevoy/master

A couple minor glsl-optimizer patches
lionxing · Oct 17, 2011 · a6cc56e · a6cc56e
2 parents b543103 + edcb87a
commit a6cc56e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h
@@ -35,7 +35,7 @@
 #define bool    _Bool
 
 /* For compilers that don't have the builtin _Bool type. */
-#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)
+#if (defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)) && !defined(_lint)
 typedef unsigned char _Bool;
 #endif
 

diff --git a/src/glsl/ir_print_glsl_visitor.cpp b/src/glsl/ir_print_glsl_visitor.cpp
@@ -208,7 +208,7 @@ void ir_print_glsl_visitor::print_precision (ir_instruction* ir)
 {
 	if (!this->use_precision)
 		return;
-	if (ir->type && !ir->type->is_float())
+	if (ir->type && !ir->type->is_float() && (!ir->type->is_array() || !ir->type->element_type()->is_float()))
 		return;
 	glsl_precision prec = precision_from_ir(ir);
 	if (prec == glsl_precision_high || prec == glsl_precision_undefined)