Merge branch 'master' into cheneym2/errcheck2

Author: cheneym2

CMakeLists.txt

@@ -199,7 +199,19 @@ advanced_option(
 )
 advanced_option(
     SLANG_OVERRIDE_GLSLANG_PATH
-    "Build using user defined path for glslang, this also requires "
+    "Build using user defined path for glslang"
+    OFF
+)
+
+advanced_option(
+    SLANG_EXCLUDE_DAWN
+    "Optionally exclude webgpu_dawn from the build"
+    OFF
+)
+
+advanced_option(
+    SLANG_EXCLUDE_TINT
+    "Optionally exclude slang-tint from the build"
     OFF
 )
 
@@ -292,24 +304,28 @@ if(SLANG_SLANG_LLVM_FLAVOR MATCHES FETCH_BINARY)
     )
 endif()
 
-set(webgpu_dawn_release_tag "webgpu_dawn-0")
-if(
-    CMAKE_SYSTEM_NAME MATCHES "Windows"
-    AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
-)
-    set(SLANG_WEBGPU_DAWN_BINARY_URL
-        "https://github.com/shader-slang/dawn/releases/download/${webgpu_dawn_release_tag}/webgpu_dawn-windows-x64.zip"
+if(NOT SLANG_EXCLUDE_DAWN)
+    set(webgpu_dawn_release_tag "webgpu_dawn-0")
+    if(
+        CMAKE_SYSTEM_NAME MATCHES "Windows"
+        AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
     )
+        set(SLANG_WEBGPU_DAWN_BINARY_URL
+            "https://github.com/shader-slang/dawn/releases/download/${webgpu_dawn_release_tag}/webgpu_dawn-windows-x64.zip"
+        )
+    endif()
 endif()
 
-set(slang_tint_release_tag "slang-tint-0")
-if(
-    CMAKE_SYSTEM_NAME MATCHES "Windows"
-    AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
-)
-    set(SLANG_SLANG_TINT_BINARY_URL
-        "https://github.com/shader-slang/dawn/releases/download/${slang_tint_release_tag}/slang-tint-windows-x64.zip"
+if(NOT SLANG_EXCLUDE_TINT)
+    set(slang_tint_release_tag "slang-tint-0")
+    if(
+        CMAKE_SYSTEM_NAME MATCHES "Windows"
+        AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64"
     )
+        set(SLANG_SLANG_TINT_BINARY_URL
+            "https://github.com/shader-slang/dawn/releases/download/${slang_tint_release_tag}/slang-tint-windows-x64.zip"
+        )
+    endif()
 endif()
 
 #

source/slang-glslang/slang-glslang.cpp

@@ -997,6 +997,8 @@ extern "C"
         spvtools::Context context(SPV_ENV_UNIVERSAL_1_5);
         spvtools::LinkerOptions options = {};
 
+        options.SetUseHighestVersion(true);
+
         spvtools::MessageConsumer consumer = [](spv_message_level_t level,
                                                 const char* source,
                                                 const spv_position_t& position,

source/slang/slang-check-shader.cpp

@@ -537,9 +537,17 @@ void validateEntryPoint(EntryPoint* entryPoint, DiagnosticSink* sink)
         }
         else
         {
-            // Only attempt to error if a user adds to slangc either `-profile` or `-capability`
-            if ((target->getOptionSet().hasOption(CompilerOptionName::Capability) ||
-                 target->getOptionSet().hasOption(CompilerOptionName::Profile)) &&
+            auto& targetOptionSet = target->getOptionSet();
+            bool specificProfileRequested =
+                targetOptionSet.hasOption(CompilerOptionName::Profile) &&
+                (targetOptionSet.getIntOption(CompilerOptionName::Profile) !=
+                 SLANG_PROFILE_UNKNOWN);
+            bool specificCapabilityRequested =
+                targetOptionSet.hasOption(CompilerOptionName::Capability) &&
+                (targetOptionSet.getIntOption(CompilerOptionName::Capability) !=
+                 SLANG_CAPABILITY_UNKNOWN);
+            // Only attempt to error if a specific profile or capability is requested
+            if ((specificCapabilityRequested || specificProfileRequested) &&
                 targetCaps.atLeastOneSetImpliedInOther(
                     entryPointFuncDecl->inferredCapabilityRequirements) ==
                     CapabilitySet::ImpliesReturnFlags::NotImplied)

source/slang/slang-emit-spirv.cpp

@@ -91,7 +91,7 @@ enum class SpvLogicalSectionID
 };
 
 // The registered id for the Slang compiler.
-static const uint32_t kSPIRVSlangCompilerId = 40;
+static const uint32_t kSPIRVSlangCompilerId = 40 << 16;
 
 // While the SPIR-V module is nominally (according to the spec) just
 // a flat sequence of instructions, in practice some of the instructions

source/slang/slang-options.cpp

@@ -1831,7 +1831,20 @@ SlangResult OptionsParser::_parseReferenceModule(const CommandLineArg& arg)
     CommandLineArg referenceModuleName;
     SLANG_RETURN_ON_FAIL(m_reader.expectArg(referenceModuleName));
 
-    return addReferencedModule(referenceModuleName.value, referenceModuleName.loc, true);
+    // Add the module to the request
+    SLANG_RETURN_ON_FAIL(
+        addReferencedModule(referenceModuleName.value, referenceModuleName.loc, true));
+
+    // In addition to adding the module to the request, we also add to the options set, because
+    // the same options parser is also used for IGlobalSession::parseCommandLineArguments, which
+    // parses options via a dummy request that is destroyed once the command line options are
+    // obtained. Therefore, also add the option here so that
+    // IGlobalSession::parseCommandLineArguments can return them.
+    m_requestImpl->getLinkage()->m_optionSet.add(
+        CompilerOptionName::ReferenceModule,
+        referenceModuleName.value);
+
+    return SLANG_OK;
 }
 
 SlangResult OptionsParser::_parseReproFileSystem(const CommandLineArg& arg)