Fix GCC 8.1 build.

HansKristian-Work · HansKristian-Work · commit 903b798da7a4 · 2018-05-07T23:41:53.000+02:00
diff --git a/build_glslang_spirv_tools.sh b/build_glslang_spirv_tools.sh
@@ -20,7 +20,7 @@ cd ../..
 echo "Building SPIRV-Tools."
 mkdir -p external/spirv-tools-build
 cd external/spirv-tools-build
-cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles"
+cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles" -DSPIRV_WERROR=OFF
 make -j$NPROC
 cd ../..
 
diff --git a/spirv_common.hpp b/spirv_common.hpp
@@ -867,6 +867,7 @@ struct SPIRConstant : IVariant
 		// Workaround for MSVC 2013, initializing an array breaks.
 		ConstantVector()
 		{
+			memset(r, 0, sizeof(r));
 			for (unsigned i = 0; i < 4; i++)
 				id[i] = 0;
 		}
@@ -1005,7 +1006,7 @@ struct SPIRConstant : IVariant
 
 	inline void make_null(const SPIRType &constant_type_)
 	{
-		std::memset(&m, 0, sizeof(m));
+		m = {};
 		m.columns = constant_type_.columns;
 		for (auto &c : m.c)
 			c.vecsize = constant_type_.vecsize;

Original file line number	Diff line number	Diff line change
`@@ -867,6 +867,7 @@ struct SPIRConstant : IVariant`
`867`	`867`	`// Workaround for MSVC 2013, initializing an array breaks.`
`868`	`868`	`ConstantVector()`
`869`	`869`	`{`
	`870`	`+ memset(r, 0, sizeof(r));`
`870`	`871`	`for (unsigned i = 0; i < 4; i++)`
`871`	`872`	`id[i] = 0;`
`872`	`873`	`}`
`@@ -1005,7 +1006,7 @@ struct SPIRConstant : IVariant`
`1005`	`1006`
`1006`	`1007`	`inline void make_null(const SPIRType &constant_type_)`
`1007`	`1008`	`{`
`1008`		`- std::memset(&m, 0, sizeof(m));`
	`1009`	`+ m = {};`
`1009`	`1010`	`m.columns = constant_type_.columns;`
`1010`	`1011`	`for (auto &c : m.c)`
`1011`	`1012`	`c.vecsize = constant_type_.vecsize;`