Skip to content

G
glslang
Commit fc7aeaee by John Kessenich Committed by GitHub
Options

Merge pull request #1077 from greg-lunarg/addopt12

Legalization: Fix warnings and disable tests when spirv-tools not present
parents 3ddcd3f1 52fe3d59
Showing with 4 additions and 2 deletions
StandAlone/StandAlone.cpp
...@@ -896,8 +896,8 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits) ...@@ -896,8 +896,8 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
glslang::SpvOptions spvOptions; glslang::SpvOptions spvOptions;
if (Options & EOptionDebug) if (Options & EOptionDebug)
spvOptions.generateDebugInfo = true; spvOptions.generateDebugInfo = true;
spvOptions.disableOptimizer = Options & EOptionOptimizeDisable; spvOptions.disableOptimizer = (Options & EOptionOptimizeDisable) != 0;
spvOptions.optimizeSize = Options & EOptionOptimizeSize; spvOptions.optimizeSize = (Options & EOptionOptimizeSize) != 0;
glslang::GlslangToSpv(*program.getIntermediate((EShLanguage)stage), spirv, &logger, &spvOptions); glslang::GlslangToSpv(*program.getIntermediate((EShLanguage)stage), spirv, &logger, &spvOptions);
// Dump the spv to a file or stdout, etc., but only if not doing // Dump the spv to a file or stdout, etc., but only if not doing
......
gtests/Hlsl.FromFile.cpp
...@@ -366,6 +366,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -366,6 +366,7 @@ INSTANTIATE_TEST_CASE_P(
); );
// clang-format on // clang-format on
#ifdef ENABLE_OPT
// clang-format off // clang-format off
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
ToSpirv, HlslLegalizeTest, ToSpirv, HlslLegalizeTest,
...@@ -378,6 +379,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -378,6 +379,7 @@ INSTANTIATE_TEST_CASE_P(
FileNameAsCustomTestSuffix FileNameAsCustomTestSuffix
); );
// clang-format on // clang-format on
#endif
} // anonymous namespace } // anonymous namespace
} // namespace glslangtest } // namespace glslangtest
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment