diff options
| author | Yong He <yonghe@outlook.com> | 2025-01-31 05:02:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-31 21:02:26 +0800 |
| commit | eebe849075c21d163739cbc5e976e7b5b6837e7f (patch) | |
| tree | ec3fd562da49385fbd5d4a6deebac78b9fe74c09 /source/slang/slang-options.cpp | |
| parent | ae778e3424b39cbeb1f367339f654560de416d30 (diff) | |
Distribute slang-glsl-module.bin in release packages. (#6233)
* Distribute slang-glsl-module.bin in release packages.
* Fix.
* fix2.
* Build glsl modlue into a dll.
Diffstat (limited to 'source/slang/slang-options.cpp')
| -rw-r--r-- | source/slang/slang-options.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index a0e8515eb..2b4d64cd9 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -888,6 +888,11 @@ void initCommandOptions(CommandOptions& options) "-save-core-module-bin-source <filename>", "Same as -save-core-module but output " "the data as a C array.\n"}, + {OptionKind::SaveGLSLModuleBinSource, + "-save-glsl-module-bin-source", + "-save-glsl-module-bin-source <filename>", + "Save the serialized glsl module " + "as a C array.\n"}, {OptionKind::TrackLiveness, "-track-liveness", nullptr, @@ -2203,14 +2208,24 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv) break; } case OptionKind::SaveCoreModuleBinSource: + case OptionKind::SaveGLSLModuleBinSource: { CommandLineArg fileName; SLANG_RETURN_ON_FAIL(m_reader.expectArg(fileName)); ComPtr<ISlangBlob> blob; - SLANG_RETURN_ON_FAIL(m_session->saveCoreModule(m_archiveType, blob.writeRef())); - + if (optionKind == OptionKind::SaveCoreModuleBinSource) + { + SLANG_RETURN_ON_FAIL(m_session->saveCoreModule(m_archiveType, blob.writeRef())); + } + else + { + SLANG_RETURN_ON_FAIL(m_session->saveBuiltinModule( + slang::BuiltinModuleName::GLSL, + m_archiveType, + blob.writeRef())); + } StringBuilder builder; StringWriter writer(&builder, 0); @@ -2763,9 +2778,7 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv) case OptionKind::Help: { SLANG_RETURN_ON_FAIL(_parseHelp(arg)); - - // We retun an error so after this has successfully passed, we quit - return SLANG_FAIL; + return SLANG_OK; } case OptionKind::EmitSpirvViaGLSL: case OptionKind::EmitSpirvDirectly: |