diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-01-04 20:02:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 20:02:04 +0800 |
| commit | e8f977a00f5d131ec2d51d2a026d6452e8f762f0 (patch) | |
| tree | 7233f9d12a971ff2000790cc0a0d33db080ef8b2 /source | |
| parent | 57e9786d69f7d7846a289f5d2ce8a34c5f177e93 (diff) | |
Avoid dots in auto-detected filename extensions (#2566)
Supersedes #2532
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-type-text-util.cpp | 7 | ||||
| -rw-r--r-- | source/slang/slang-options.cpp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/core/slang-type-text-util.cpp b/source/core/slang-type-text-util.cpp index 9985b8b23..bfa193486 100644 --- a/source/core/slang-type-text-util.cpp +++ b/source/core/slang-type-text-util.cpp @@ -52,20 +52,21 @@ struct CompileTargetInfo const char* names; ///< Comma delimited list of names associated with the target. NOTE! First name is taken as the normal display name. }; +// Make sure to keep this table in sync with that in slang/slang-options.cpp getHelpText static const CompileTargetInfo s_compileTargetInfos[] = { { SLANG_TARGET_UNKNOWN, "", "unknown"}, { SLANG_TARGET_NONE, "", "none"}, { SLANG_HLSL, "hlsl,fx", "hlsl"}, { SLANG_DXBC, "dxbc", "dxbc"}, - { SLANG_DXBC_ASM, "dxbc.asm", "dxbc-asm,dxbc-assembly" }, + { SLANG_DXBC_ASM, "dxbc-asm", "dxbc-asm,dxbc-assembly" }, { SLANG_DXIL, "dxil", "dxil" }, - { SLANG_DXIL_ASM, "dxil.asm", "dxil-asm,dxil-assembly" }, + { SLANG_DXIL_ASM, "dxil-asm", "dxil-asm,dxil-assembly" }, { SLANG_GLSL, "glsl,vert,frag,geom,tesc,tese,comp", "glsl" }, { SLANG_GLSL_VULKAN, "", "glsl-vulkan" }, { SLANG_GLSL_VULKAN_ONE_DESC, "", "glsl-vulkan-one-desc" }, { SLANG_SPIRV, "spv", "spirv"}, - { SLANG_SPIRV_ASM, "spv.asm", "spirv-asm,spirv-assembly" }, + { SLANG_SPIRV_ASM, "spv-asm", "spirv-asm,spirv-assembly" }, { SLANG_C_SOURCE, "c", "c" }, { SLANG_CPP_SOURCE, "cpp,c++,cxx", "cpp,c++,cxx" }, { SLANG_HOST_CPP_SOURCE, "cpp,c++,cxx", "host-cpp,host-c++,host-cxx"}, diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index 0ad4ccfaf..5ac0d7663 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -683,9 +683,9 @@ struct OptionsParser " ====================|=================|======\n" " .hlsl, .fx -> hlsl\n" " .dxbc -> dxbc\n" - " .dxbc.asm -> dxbc-assembly\n" + " .dxbc-asm -> dxbc-assembly\n" " .dxil -> dxil\n" - " .dxil.asm -> dxil-assembly\n" + " .dxil-asm -> dxil-assembly\n" " .glsl -> glsl\n" " .vert -> glsl vertex\n" " .frag -> glsl fragment\n" @@ -695,7 +695,7 @@ struct OptionsParser " .comp -> glsl compute\n" " .slang -> slang\n" " .spv -> spirv\n" - " .spv.asm -> spirv-assembly\n" + " .spv-asm -> spirv-assembly\n" " .c -> c\n" " .cpp, .c++, .cxx -> c++\n" " .exe -> executable\n" |