Merge pull request #1115 from LoopDawg/stdarray-binding-set

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

Merge pull request #1115 from LoopDawg/stdarray-binding-set
b1eaf82c · John Kessenich · GitHub · 573cc9e9 · 2915da30 · b1eaf82c
Commit b1eaf82c authored Oct 20, 2017 by John Kessenich Committed by GitHub Oct 20, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

localintermediate.h glslang/MachineIndependent/localintermediate.h +1 -2

hlslParseHelper.cpp hlsl/hlslParseHelper.cpp +2 -2

No files found.
--- 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;
+    std::array<std::map<int, int>, EResCount>  shiftBindingForSet;
-    TDescriptorSetShift shiftBindingForSet[EResCount];
    std::vector<std::string> resourceSetBinding;
    bool autoMapBindings;

--- 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 ||
+        return (type.isArray() && intermediate.getFlattenUniformArrays() && topLevel) ||
-               type.isStruct() && type.containsOpaque();
+               (type.isStruct() && type.containsOpaque());
    default:
        return type.isStruct() && type.containsOpaque();
    };