Merge pull request #392 from antiagainst/order

Build: Reorder fields to avoid compiler initialization order error.
This commit is contained in:
John Kessenich 2016-07-15 10:58:37 -06:00 committed by GitHub
commit efb89a3d2e

View file

@ -1717,13 +1717,13 @@ protected:
// functionality is added. // functionality is added.
// HLSL does have a 1-component vectors, so this will be true to disambiguate // HLSL does have a 1-component vectors, so this will be true to disambiguate
// from a scalar. // from a scalar.
TSampler sampler;
TQualifier qualifier; TQualifier qualifier;
TArraySizes* arraySizes; // nullptr unless an array; can be shared across types TArraySizes* arraySizes; // nullptr unless an array; can be shared across types
TTypeList* structure; // nullptr unless this is a struct; can be shared across types TTypeList* structure; // nullptr unless this is a struct; can be shared across types
TString *fieldName; // for structure field names TString *fieldName; // for structure field names
TString *typeName; // for structure type name TString *typeName; // for structure type name
TSampler sampler;
}; };
} // end namespace glslang } // end namespace glslang