From 35dabea7868a2f82f59337dd647e486c23f42398 Mon Sep 17 00:00:00 2001
From: Roy <lryer@msn.com>
Date: Wed, 4 Sep 2019 11:37:56 +0800
Subject: [PATCH] Fix code style issue and remove setXfbBufferStride new
 paramte

1. Keep the curly braces style.
2. revert a Improper change
---
 glslang/MachineIndependent/Intermediate.cpp    | 3 +--
 glslang/MachineIndependent/localintermediate.h | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 62af2b6e..429e1e8d 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -839,8 +839,7 @@ TIntermTyped* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
             return nullptr;
     }
 
-    if (!buildConvertOp(convertTo, node->getBasicType(), newOp))
-    {
+    if (!buildConvertOp(convertTo, node->getBasicType(), newOp)) {
         return nullptr;
     }
 
diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index ad0b0fd5..2e4997de 100644
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -693,9 +693,9 @@ public:
     bool getPixelCenterInteger() const { return pixelCenterInteger; }
     void addBlendEquation(TBlendEquationShift b) { blendEquations |= (1 << b); }
     unsigned int getBlendEquations() const { return blendEquations; }
-    bool setXfbBufferStride(int buffer, unsigned stride, bool force = false)
+    bool setXfbBufferStride(int buffer, unsigned stride)
     {
-        if (xfbBuffers[buffer].stride != TQualifier::layoutXfbStrideEnd && force == false)
+        if (xfbBuffers[buffer].stride != TQualifier::layoutXfbStrideEnd)
             return xfbBuffers[buffer].stride == stride;
         xfbBuffers[buffer].stride = stride;
         return true;