diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
index 88d0332ec..b81749e31 100644
--- a/tools/shaderc/shaderc_spirv.cpp
+++ b/tools/shaderc/shaderc_spirv.cpp
@@ -980,7 +980,10 @@ namespace bgfx { namespace spirv
 
 				opt.RegisterLegalizationPasses();
 
-				if (!opt.Run(spirv.data(), spirv.size(), &spirv) )
+				spvtools::ValidatorOptions validatorOptions;
+				validatorOptions.SetBeforeHlslLegalization(true);
+
+				if (!opt.Run(spirv.data(), spirv.size(), &spirv, validatorOptions, false) )
 				{
 					compiled = false;
 				}