glsl: Add heuristics to print floating-point numbers better.

v2: Fix *.expected files to match.
Reviewed-by: Paul Berry <strereotype441@gmail.com>

14 files changed, 31 insertions, 31 deletions

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
index a4cb2d6..3771efc 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) (break)
+      (if (expression bool > (var_ref b) (constant float (0.0))) (break)
        ())))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
index 325f7b4..afae5e7 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
@@ -3,6 +3,6 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000)))
+      (if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref c) (constant float (1.000000))) break)
        ())))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
index a773545..588a3f6 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) ()
+      (if (expression bool > (var_ref b) (constant float (0.0))) ()
        (break))))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
index 0dd4a52..da2d1a2 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) ()
+      (if (expression bool > (var_ref b) (constant float (0.0))) ()
        ((assign (x) (var_ref c) (constant float (1.000000))) break))))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
index 8222328..9adf865 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
@@ -8,15 +8,15 @@
     (loop () () () ()
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
-      (if (expression bool > (var_ref a) (constant float (0.000000)))
-       ((if (expression bool > (var_ref ba) (constant float (0.000000)))
-         ((if (expression bool > (var_ref bb) (constant float (0.000000)))
+      (if (expression bool > (var_ref a) (constant float (0.0)))
+       ((if (expression bool > (var_ref ba) (constant float (0.0)))
+         ((if (expression bool > (var_ref bb) (constant float (0.0)))
            ((assign (x) (var_ref execute_flag) (constant bool (0))))
            ()))
          ())
         (if (var_ref execute_flag)
-         ((if (expression bool > (var_ref ca) (constant float (0.000000)))
-           ((if (expression bool > (var_ref cb) (constant float (0.000000)))
+         ((if (expression bool > (var_ref ca) (constant float (0.0)))
+           ((if (expression bool > (var_ref cb) (constant float (0.0)))
              ((assign (x) (var_ref break_flag) (constant bool (1)))
               (assign (x) (var_ref execute_flag) (constant bool (0))))
              ()))
diff --git a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
index 7c6e73f..a69e2b7 100644
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
@@ -6,13 +6,13 @@
     (loop () () () ()
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
-      (if (expression bool > (var_ref aa) (constant float (0.000000)))
-       ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+      (if (expression bool > (var_ref aa) (constant float (0.0)))
+       ((if (expression bool > (var_ref ab) (constant float (0.0)))
          ((assign (x) (var_ref execute_flag) (constant bool (0))))
          ()))
        ())
       (if (var_ref execute_flag)
-       ((if (expression bool > (var_ref b) (constant float (0.000000)))
+       ((if (expression bool > (var_ref b) (constant float (0.0)))
          ((assign (x) (var_ref break_flag) (constant bool (1)))
           (assign (x) (var_ref execute_flag) (constant bool (0))))
          ()))
diff --git a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
index bf45c2c..b921d30 100644
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
@@ -7,16 +7,16 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+    (if (expression bool > (var_ref aa) (constant float (0.0)))
+     ((if (expression bool > (var_ref ab) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
      ())
     (if (var_ref execute_flag)
      ((loop () () () ()
-       ((if (expression bool > (var_ref b) (constant float (0.000000)))
-         ((if (expression bool > (var_ref c) (constant float (0.000000))) ()
+       ((if (expression bool > (var_ref b) (constant float (0.0)))
+         ((if (expression bool > (var_ref c) (constant float (0.0))) ()
            (continue)))
          ((assign (x) (var_ref return_flag) (constant bool (1)))))
         break))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
index d4835e9..5b62bbc 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
@@ -6,8 +6,8 @@
     (declare (temporary) float return_value)
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_value) (constant float (1.000000)))
         (assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
index b551a06..07c6842 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
@@ -6,7 +6,7 @@
     (declare (temporary) float return_value)
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
      ((assign (x) (var_ref return_value) (constant float (1.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
       (assign (x) (var_ref execute_flag) (constant bool (0))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
index e8b36f1..7e3fe31 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
@@ -1,8 +1,8 @@
 ((declare (in) float a) (declare (in) float b)
  (function main
   (signature void (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+   ((if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((return))
        ()))
      ())))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
index e15a97d..b47f5a4 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
@@ -5,8 +5,8 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
index 07db6e7..7424968 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
@@ -1,8 +1,8 @@
 ((declare (in) float a) (declare (in) float b)
  (function sub
   (signature void (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+   ((if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((return))
        ()))
      ())))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
index 3110980..1a3eae5 100644
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
@@ -5,8 +5,8 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
diff --git a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
index 271cd3b..c0b51e1 100644
--- a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
@@ -6,15 +6,15 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+    (if (expression bool > (var_ref aa) (constant float (0.0)))
+     ((if (expression bool > (var_ref ab) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
      ())
     (if (var_ref execute_flag)
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
-       ((if (expression bool > (var_ref c) (constant float (0.000000))) () ())
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
+       ((if (expression bool > (var_ref c) (constant float (0.0))) () ())
         (assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))