From 7de044c062fe00397b63d021078789ee219a019f Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Fri, 30 Aug 2019 09:51:06 -0600
Subject: [PATCH] Non-functional: Make whitespace/braces consistent for a
 recent commit.

---
 glslang/MachineIndependent/ParseHelper.cpp | 19 ++---------------
 glslang/MachineIndependent/glslang.m4      | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index bb6ab24a..0b0f94ce 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -7083,7 +7083,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                 assert(0);
                 break;
             case EbtInt:
-            {
                 switch (node->getType().getBasicType()) {
                     case EbtFloat:   op = EOpConvFloatToInt;    break;
                     case EbtFloat16: op = EOpConvFloat16ToInt;  break;
@@ -7092,26 +7091,19 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint:    op = EOpConvUintToInt;     break;
                     default: assert(0);
                 }
-
-            }
                 break;
             case EbtUint:
-            {
                 switch (node->getType().getBasicType()) {
                     case EbtFloat:   op = EOpConvFloatToUint;    break;
                     case EbtFloat16: op = EOpConvFloat16ToUint;  break;
                     case EbtUint8:   op = EOpConvUint8ToUint;    break;
-                    case EbtInt8:    op = EOpConvInt8ToUint;    break;
+                    case EbtInt8:    op = EOpConvInt8ToUint;     break;
                     case EbtInt:     op = EOpConvIntToUint;      break;
                     case EbtUint:    op = EOpConvUintToInt8;     break;
                     default: assert(0);
                 }
-
-            }
                 break;
-
             case EbtInt8:
-            {
                 switch (node->getType().getBasicType()) {
                     case EbtFloat:   op = EOpConvFloatToInt8;    break;
                     case EbtFloat16: op = EOpConvFloat16ToInt8;  break;
@@ -7120,10 +7112,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint:    op = EOpConvUintToInt8;     break;
                     default: assert(0);
                 }
-
-            }
                 break;
-            case EbtUint8: {
+            case EbtUint8:
                 switch (node->getType().getBasicType()) {
                     case EbtFloat:   op = EOpConvFloatToUint8;   break;
                     case EbtFloat16: op = EOpConvFloat16ToUint8; break;
@@ -7132,10 +7122,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint:    op = EOpConvUintToUint8;    break;
                     default: assert(0);
                 }
-            }
                 break;
             case EbtFloat:
-            {
                 switch (node->getType().getBasicType()) {
                     case EbtFloat16: op = EOpConvFloat16ToFloat;  break;
                     case EbtInt8:    op = EOpConvInt8ToFloat;     break;
@@ -7144,10 +7132,8 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint:    op = EOpConvUintToFloat;     break;
                     default: assert(0);
                 }
-            }
                 break;
             case EbtFloat16:
-            {
                 switch (node->getType().getBasicType()) {
                     case EbtFloat:  op = EOpConvFloatToFloat16;  break;
                     case EbtInt8:   op = EOpConvInt8ToFloat16;   break;
@@ -7156,7 +7142,6 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
                     case EbtUint:   op = EOpConvUintToFloat16;   break;
                     default: assert(0);
                 }
-            }
                 break;
             }
 
diff --git a/glslang/MachineIndependent/glslang.m4 b/glslang/MachineIndependent/glslang.m4
index cbddef1b..6ace0380 100644
--- a/glslang/MachineIndependent/glslang.m4
+++ b/glslang/MachineIndependent/glslang.m4
@@ -3183,18 +3183,18 @@ GLSLANG_WEB_EXCLUDE_ON
         $$.basicType = EbtFloat;
         $$.coopmat = true;
     }
-    | ICOOPMATNV {
-        parseContext.intcoopmatCheck($1.loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtInt;
-        $$.coopmat = true;
-    }
-    | UCOOPMATNV {
-        parseContext.intcoopmatCheck($1.loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel());
-        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
-        $$.basicType = EbtUint;
-        $$.coopmat = true;
-    }
+    | ICOOPMATNV {
+        parseContext.intcoopmatCheck($1.loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtInt;
+        $$.coopmat = true;
+    }
+    | UCOOPMATNV {
+        parseContext.intcoopmatCheck($1.loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel());
+        $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
+        $$.basicType = EbtUint;
+        $$.coopmat = true;
+    }
 GLSLANG_WEB_EXCLUDE_OFF
     | struct_specifier {
         $$ = $1;