From faf042ecc3e688a1a3ffbe1ac44d18dd7ddf441a Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 29 May 2025 08:05:57 -0700 Subject: Language version + tuple syntax. (#7230) * Language version + tuple syntax. * Fix compile error. * regenerate documentation Table of Contents * Fix. * regenerate command line reference * Fix. * Fix. * Fix more test failures. * revert empty line change, * Retrigger CI * #version->#lang * Update source/core/slang-type-text-util.cpp Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> * Remove comments. * Fix parsing logic. * Fix parser. * Fix parser. * update test comment * Update options. * regenerate documentation Table of Contents * regenerate command line reference --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> --- include/slang.h | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/slang.h b/include/slang.h index 4164ce9e9..dc52e80b3 100644 --- a/include/slang.h +++ b/include/slang.h @@ -627,17 +627,6 @@ typedef uint32_t SlangSizeT; SLANG_TARGET_COUNT_OF, }; - typedef int SlangStdRevisionIntegral; - enum SlangStdRevision : SlangStdRevisionIntegral - { - SLANG_STD_REVISION_UNKNOWN, - SLANG_STD_REVISION_2025, - SLANG_STD_REVISION_2026, - SLANG_STD_REVISION_COUNT_OF, - - SLANG_STD_REVISION_DEFAULT = SLANG_STD_REVISION_2025, - }; - /* A "container format" describes the way that the outputs for multiple files, entry points, targets, etc. should be combined into a single artifact for output. */ @@ -1034,7 +1023,7 @@ typedef uint32_t SlangSizeT; DumpModule, EnableExperimentalDynamicDispatch, // bool, experimental - StdRevision, // intValue0: SlangStdRevision + LanguageVersion, // intValue0: SlangLanguageVersion CountOf, }; @@ -4518,7 +4507,12 @@ struct SpecializationArg enum SlangLanguageVersion { - SLANG_LANGUAGE_VERSION_2025 = 2025 + SLANG_LANGUAGE_VERSION_UNKNOWN = 0, + SLANG_LANGUAGE_VERSION_LEGACY = 2018, + SLANG_LANGUAGE_VERSION_2025 = 2025, + SLANG_LANGUAGE_VERSION_2026 = 2026, + SLANG_LANGAUGE_VERSION_DEFAULT = SLANG_LANGUAGE_VERSION_LEGACY, + SLANG_LANGUAGE_VERSION_LATEST = SLANG_LANGUAGE_VERSION_2026, }; @@ -4532,8 +4526,8 @@ struct SlangGlobalSessionDesc /// Slang API version. uint32_t apiVersion = SLANG_API_VERSION; - /// Slang language version. - uint32_t languageVersion = SLANG_LANGUAGE_VERSION_2025; + /// Specify the oldest Slang language version that any sessions will use. + uint32_t minLanguageVersion = SLANG_LANGUAGE_VERSION_2025; /// Whether to enable GLSL support. bool enableGLSL = false; -- cgit v1.2.3