From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 4 Mar 2020 20:09:58 +0000 (-0800)
Subject: soft-fp64/fadd: Reformat after previous commit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=480565812c1472faf440b3a27864c8c34610a0f5;p=mesa.git

soft-fp64/fadd: Reformat after previous commit

Convert

   } else if (...) {
      ...
   } else {
      ...
   }

to

   } else {
      if (...) {
         ...
      } else {
         ...
      }
   }

Not doing this reformatting in the previous commit makes the previous
commit easier to review, and doing it before the next commit makes the
next commit easier to review.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4142>
---

diff --git a/src/compiler/glsl/float64.glsl b/src/compiler/glsl/float64.glsl
index 68f79c4c563..b24a7812b92 100644
--- a/src/compiler/glsl/float64.glsl
+++ b/src/compiler/glsl/float64.glsl
@@ -697,27 +697,29 @@ __fadd64(uint64_t a, uint64_t b)
          zExp = aExp;
          __shift64ExtraRightJamming(
             zFrac0, zFrac1, zFrac2, 1, zFrac0, zFrac1, zFrac2);
-      } else if (0 < expDiff) {
-         if (aExp == 0x7FF) {
-            bool propagate = (aFracHi | aFracLo) != 0u;
-            return mix(a, __propagateFloat64NaN(a, b), propagate);
-         }
-
-         expDiff = mix(expDiff, expDiff - 1, bExp == 0);
-         bFracHi = mix(bFracHi | 0x00100000u, bFracHi, bExp == 0);
-         __shift64ExtraRightJamming(
-            bFracHi, bFracLo, 0u, expDiff, bFracHi, bFracLo, zFrac2);
-         zExp = aExp;
       } else {
-         if (bExp == 0x7FF) {
-            bool propagate = (bFracHi | bFracLo) != 0u;
-            return mix(__packFloat64(aSign, 0x7ff, 0u, 0u), __propagateFloat64NaN(a, b), propagate);
+         if (0 < expDiff) {
+            if (aExp == 0x7FF) {
+               bool propagate = (aFracHi | aFracLo) != 0u;
+               return mix(a, __propagateFloat64NaN(a, b), propagate);
+            }
+
+            expDiff = mix(expDiff, expDiff - 1, bExp == 0);
+            bFracHi = mix(bFracHi | 0x00100000u, bFracHi, bExp == 0);
+            __shift64ExtraRightJamming(
+               bFracHi, bFracLo, 0u, expDiff, bFracHi, bFracLo, zFrac2);
+            zExp = aExp;
+         } else {
+            if (bExp == 0x7FF) {
+               bool propagate = (bFracHi | bFracLo) != 0u;
+               return mix(__packFloat64(aSign, 0x7ff, 0u, 0u), __propagateFloat64NaN(a, b), propagate);
+            }
+            expDiff = mix(expDiff, expDiff + 1, aExp == 0);
+            aFracHi = mix(aFracHi | 0x00100000u, aFracHi, aExp == 0);
+            __shift64ExtraRightJamming(
+               aFracHi, aFracLo, 0u, - expDiff, aFracHi, aFracLo, zFrac2);
+            zExp = bExp;
          }
-         expDiff = mix(expDiff, expDiff + 1, aExp == 0);
-         aFracHi = mix(aFracHi | 0x00100000u, aFracHi, aExp == 0);
-         __shift64ExtraRightJamming(
-            aFracHi, aFracLo, 0u, - expDiff, aFracHi, aFracLo, zFrac2);
-         zExp = bExp;
       }
       if (!orig_exp_diff_is_zero) {
          aFracHi |= 0x00100000u;