Incremented version to 1.4.0.

Updated glslang and SPIRV-Cross. Fixes for command-line argouments and
running the validations.

Author: akb825

CMakeLists.txt

@@ -57,7 +57,7 @@ if (MSL_OUTPUT_DIR)
 endif()
 
 set(MSL_MAJOR_VERSION 1)
-set(MSL_MINOR_VERSION 3)
+set(MSL_MINOR_VERSION 4)
 set(MSL_PATCH_VERSION 0)
 set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
 

Compile/SPIRV-Cross

@@ -348,11 +348,16 @@ void Compiler::process(SpirV& spirv, int processOptions)
 
 	if (processOptions & Optimize)
 	{
+		// NOTE: We have some known invalid code, such as missing bindings. Therefore we need to
+		// skip validation.
+		spv_optimizer_options options = spvOptimizerOptionsCreate();
+		spvOptimizerOptionsSetRunValidator(options, false);
 		spvtools::Optimizer optimizer(SPV_ENV_VULKAN_1_0);
 		optimizer.RegisterPerformancePasses();
 		SpirV optimizedSpirV;
-		if (optimizer.Run(spirv.data(), spirv.size()*sizeof(std::uint32_t), &optimizedSpirV))
+		if (optimizer.Run(spirv.data(), spirv.size(), &optimizedSpirV, options))
 			spirv = std::move(optimizedSpirV);
+		spvOptimizerOptionsDestroy(options);
 	}
 }
 

Compile/glslang

@@ -474,9 +474,9 @@ int main(int argc, char** argv)
 		("warn-none,w", "disable all warnings")
 		("warn-error,W", "treat warnings as errors")
 		("strip,s", "strip debug symbols")
-		("optimize,O", value<unsigned int>()->default_value(2), "optimize the compiled result. "
-			"An integer value (1, 2) determines the optimization level. If not provided, the "
-			"maximum level will be used.");
+		("optimize,O", value<unsigned int>(), "optimize the compiled result. An integer value "
+			"(1, 2) determines the optimization level. If not provided, the maximum level will be "
+			"used.");
 
 	options_description configOptions("options in target configuration file");
 	configOptions.add_options()