Fix build several build errors

glslang/SPIRV/SpvBuilder.cpp:2533:27: error: comparison of integers of different signs: 'int' and 'size_type' (aka 'unsigned long') [-Werror,-Wsign-compare] for (int c = 0; c < accessChain.swizzle.size(); ++c) ~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. glslang/hlsl/hlslParseHelper.cpp:69:5: error: field 'cullDistanceInput' will be initialized after field 'clipDistanceOutput' [-Werror,-Wreorder] cullDistanceInput(nullptr), ^ 1 error generated. glslang/glslang/MachineIndependent/attribute.cpp:85:16: error: comparison of integers of different signs: 'int' and 'size_type' (aka 'unsigned long') [-Werror,-Wsign-compare] if (argNum >= args->getSequence().size()) ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated.

Fix build several build errors
bfe09521 · Daniel Koch · 2ad4737d · bfe09521 · bfe09521 · bfe09521
Commit bfe09521 authored Mar 13, 2018 by Daniel Koch
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

SpvBuilder.cpp SPIRV/SpvBuilder.cpp +1 -1

attribute.cpp glslang/MachineIndependent/attribute.cpp +1 -1

hlslParseHelper.cpp hlsl/hlslParseHelper.cpp +3 -3

No files found.
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -2530,7 +2530,7 @@ void Builder::remapDynamicSwizzle()
    if (accessChain.component != NoResult && accessChain.swizzle.size() > 1) {
        // build a vector of the swizzle for the component to map into
        std::vector<Id> components;
-        for (int c = 0; c < accessChain.swizzle.size(); ++c)
+        for (int c = 0; c < (int)accessChain.swizzle.size(); ++c)
            components.push_back(makeUintConstant(accessChain.swizzle[c]));
        Id mapType = makeVectorType(makeUintType(32), (int)accessChain.swizzle.size());
        Id map = makeCompositeConstant(mapType, components);

--- a/glslang/MachineIndependent/attribute.cpp
+++ b/glslang/MachineIndependent/attribute.cpp
@@ -82,7 +82,7 @@ const TConstUnion* TAttributeArgs::getConstUnion(TBasicType basicType, int argNu
    if (args == nullptr)
        return nullptr;
-    if (argNum >= args->getSequence().size())
+    if (argNum >= (int)args->getSequence().size())
        return nullptr;
    const TConstUnion* constVal = &args->getSequence()[argNum]->getAsConstantUnion()->getConstArray()[0];

--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -65,10 +65,10 @@ HlslParseContext::HlslParseContext(TSymbolTable& symbolTable, TIntermediate& int
    entryPointFunction(nullptr),
    entryPointFunctionBody(nullptr),
    gsStreamOutput(nullptr),
-    clipDistanceInput(nullptr),
-    cullDistanceInput(nullptr),
    clipDistanceOutput(nullptr),
-    cullDistanceOutput(nullptr)
+    cullDistanceOutput(nullptr),
+    clipDistanceInput(nullptr),
+    cullDistanceInput(nullptr)
 {
    globalUniformDefaults.clear();
    globalUniformDefaults.layoutMatrix = ElmRowMajor;