Nonfunctional: minor: use std::array for per-set shifts, fix warning.

Two unrelated, minor tweaks:

(1) Use std::array for shiftBindingForSet.  Now matches shiftBinding.
(2) Add parens in shouldFlatten() to make compiler warning happy.

diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index 6a855c1a4d22263e86d592d3939f1f1f9762751f..8495395251c49c874ab0c3eef32995d0486f4cce 100644 (file)
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -677,8 +677,7 @@ protected:
     std::array<unsigned int, EResCount> shiftBinding;
 
     // Per-descriptor-set shift values
-    typedef std::map<int, int> TDescriptorSetShift;
-    TDescriptorSetShift shiftBindingForSet[EResCount];
+    std::array<std::map<int, int>, EResCount>  shiftBindingForSet;
 
     std::vector<std::string> resourceSetBinding;
     bool autoMapBindings;

diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index b3fc1165a66cffde9a1000a18ec2a8033b32f01e..01b9cc3e602ca56d9cfcf2c5d39a70516921bbe9 100755 (executable)
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -1157,8 +1157,8 @@ bool HlslParseContext::shouldFlatten(const TType& type, TStorageQualifier qualif
     case EvqVaryingOut:
         return type.isStruct() || type.isArray();
     case EvqUniform:
-        return type.isArray() && intermediate.getFlattenUniformArrays() && topLevel ||
-               type.isStruct() && type.containsOpaque();
+        return (type.isArray() && intermediate.getFlattenUniformArrays() && topLevel) ||
+               (type.isStruct() && type.containsOpaque());
     default:
         return type.isStruct() && type.containsOpaque();
     };