Legalization: Fix warnings and disable tests when spirv-tools not present

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index d2587c1..f427179 100644 (file)
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -896,8 +896,8 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
                     glslang::SpvOptions spvOptions;
                     if (Options & EOptionDebug)
                         spvOptions.generateDebugInfo = true;
-                    spvOptions.disableOptimizer = Options & EOptionOptimizeDisable;
-                    spvOptions.optimizeSize = Options & EOptionOptimizeSize;
+                    spvOptions.disableOptimizer = (Options & EOptionOptimizeDisable) != 0;
+                    spvOptions.optimizeSize = (Options & EOptionOptimizeSize) != 0;
                     glslang::GlslangToSpv(*program.getIntermediate((EShLanguage)stage), spirv, &logger, &spvOptions);
 
                     // Dump the spv to a file or stdout, etc., but only if not doing

diff --git a/gtests/Hlsl.FromFile.cpp b/gtests/Hlsl.FromFile.cpp
index 51c2a4b..4e810de 100644 (file)
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -366,6 +366,7 @@ INSTANTIATE_TEST_CASE_P(
 );
 // clang-format on
 
+#ifdef ENABLE_OPT
 // clang-format off
 INSTANTIATE_TEST_CASE_P(
     ToSpirv, HlslLegalizeTest,
@@ -378,6 +379,7 @@ INSTANTIATE_TEST_CASE_P(
     FileNameAsCustomTestSuffix
 );
 // clang-format on
+#endif
 
 }  // anonymous namespace
 }  // namespace glslangtest