Add slangc interface to compile and use ir modules. (#3615)

* Add slangc interface to compile and use ir modules.

* Fix glsl scalar layout settings not copied to target.

* Fix.

* Cleanups.

2 files changed, 86 insertions, 86 deletions

diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index f585abe5b..dd0394fdf 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -85,19 +85,22 @@ void ShaderCompilerUtil::Output::reset()
     out.m_requestForKernels = slangRequest;
     out.session = globalSession;
 
+    bool hasRepro = false;
+
     // Parse all the extra args
     {
         List<const char*> args;
         for (const auto& arg : options.downstreamArgs.getArgsByName("slang"))
         {
             args.add(arg.value.getBuffer());
+            if (arg.value == "-load-repro")
+                hasRepro = true;
         }
 
         // If there are additional args parse them
         if (args.getCount())
         {
             const auto res = slangRequest->processCommandLineArguments(args.getBuffer(), int(args.getCount()));
-
             // If there is a parse failure and diagnostic, output it
             if (SLANG_FAILED(res))
             {
@@ -109,100 +112,105 @@ void ShaderCompilerUtil::Output::reset()
             }
         }
     }
-    spSetCodeGenTarget(slangRequest, input.target);
-    spSetTargetProfile(slangRequest, 0, spFindProfile(out.session, input.profile.getBuffer()));
-    if (options.generateSPIRVDirectly)
-        spSetTargetFlags(slangRequest, 0, SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY);
-
-    slangRequest->setAllowGLSLInput(options.allowGLSL);
 
-    // Define a macro so that shader code in a test can detect what language we
-    // are nominally working with.
-    char const* langDefine = nullptr;
-    switch (input.sourceLanguage)
+    // Only proceed if the command line arguments are not loading a repro.
+    if (!hasRepro)
     {
-    case SLANG_SOURCE_LANGUAGE_GLSL:
-        spAddPreprocessorDefine(slangRequest, "__GLSL__", "1");
-        break;
+        spSetCodeGenTarget(slangRequest, input.target);
+        spSetTargetProfile(slangRequest, 0, spFindProfile(out.session, input.profile.getBuffer()));
+        if (options.generateSPIRVDirectly)
+            spSetTargetFlags(slangRequest, 0, SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY);
 
-    case SLANG_SOURCE_LANGUAGE_SLANG:
-        spAddPreprocessorDefine(slangRequest, "__SLANG__", "1");
-        // fall through
-    case SLANG_SOURCE_LANGUAGE_HLSL:
-        spAddPreprocessorDefine(slangRequest, "__HLSL__", "1");
-        break;
-    case SLANG_SOURCE_LANGUAGE_C:
-        spAddPreprocessorDefine(slangRequest, "__C__", "1");
-        break;
-    case SLANG_SOURCE_LANGUAGE_CPP:
-        spAddPreprocessorDefine(slangRequest, "__CPP__", "1");
-        break;
-    case SLANG_SOURCE_LANGUAGE_CUDA:
-        spAddPreprocessorDefine(slangRequest, "__CUDA__", "1");
-        break;
+        slangRequest->setAllowGLSLInput(options.allowGLSL);
 
-    default:
-        assert(!"unexpected");
-        break;
-    }
+        // Define a macro so that shader code in a test can detect what language we
+        // are nominally working with.
+        char const* langDefine = nullptr;
+        switch (input.sourceLanguage)
+        {
+        case SLANG_SOURCE_LANGUAGE_GLSL:
+            spAddPreprocessorDefine(slangRequest, "__GLSL__", "1");
+            break;
 
-    if (input.passThrough != SLANG_PASS_THROUGH_NONE)
-    {
-        spSetPassThrough(slangRequest, input.passThrough);
-    }
-    else
-    {
-        spSetCompileFlags(slangRequest, SLANG_COMPILE_FLAG_NO_CODEGEN);
-    }
+        case SLANG_SOURCE_LANGUAGE_SLANG:
+            spAddPreprocessorDefine(slangRequest, "__SLANG__", "1");
+            // fall through
+        case SLANG_SOURCE_LANGUAGE_HLSL:
+            spAddPreprocessorDefine(slangRequest, "__HLSL__", "1");
+            break;
+        case SLANG_SOURCE_LANGUAGE_C:
+            spAddPreprocessorDefine(slangRequest, "__C__", "1");
+            break;
+        case SLANG_SOURCE_LANGUAGE_CPP:
+            spAddPreprocessorDefine(slangRequest, "__CPP__", "1");
+            break;
+        case SLANG_SOURCE_LANGUAGE_CUDA:
+            spAddPreprocessorDefine(slangRequest, "__CUDA__", "1");
+            break;
+
+        default:
+            assert(!"unexpected");
+            break;
+        }
 
-    
-    const auto sourceLanguage = input.sourceLanguage;
+        if (input.passThrough != SLANG_PASS_THROUGH_NONE)
+        {
+            spSetPassThrough(slangRequest, input.passThrough);
+        }
+        else
+        {
+            spSetCompileFlags(slangRequest, SLANG_COMPILE_FLAG_NO_CODEGEN);
+        }
 
-    int translationUnitIndex = 0;
-    {
-        translationUnitIndex = spAddTranslationUnit(slangRequest, sourceLanguage, nullptr);
-        spAddTranslationUnitSourceString(slangRequest, translationUnitIndex, request.source.path, request.source.dataBegin);
-    }
 
-    const int globalSpecializationArgCount = int(request.globalSpecializationArgs.getCount());
-    for(int ii = 0; ii < globalSpecializationArgCount; ++ii )
-    {
-        spSetTypeNameForGlobalExistentialTypeParam(slangRequest, ii, request.globalSpecializationArgs[ii].getBuffer());
-    }
+        const auto sourceLanguage = input.sourceLanguage;
 
-    const int entryPointSpecializationArgCount = int(request.entryPointSpecializationArgs.getCount());
-    auto setEntryPointSpecializationArgs = [&](int entryPoint)
-    {
-        for( int ii = 0; ii < entryPointSpecializationArgCount; ++ii )
+        int translationUnitIndex = 0;
         {
-            spSetTypeNameForEntryPointExistentialTypeParam(slangRequest, entryPoint, ii, request.entryPointSpecializationArgs[ii].getBuffer());
+            translationUnitIndex = spAddTranslationUnit(slangRequest, sourceLanguage, nullptr);
+            spAddTranslationUnitSourceString(slangRequest, translationUnitIndex, request.source.path, request.source.dataBegin);
         }
-    };
 
-   Index explicitEntryPointCount = request.entryPoints.getCount();
-   for(Index ee = 0; ee < explicitEntryPointCount; ++ee)
-   {
-        if(options.dontAddDefaultEntryPoints)
+        const int globalSpecializationArgCount = int(request.globalSpecializationArgs.getCount());
+        for (int ii = 0; ii < globalSpecializationArgCount; ++ii)
         {
-            // If default entry points are not to be added, then
-            // the `request.entryPoints` array should have been
-            // left empty.
-            //
-            SLANG_ASSERT(false);
+            spSetTypeNameForGlobalExistentialTypeParam(slangRequest, ii, request.globalSpecializationArgs[ii].getBuffer());
         }
 
-       auto& entryPointInfo = request.entryPoints[ee];
-       int entryPointIndex = spAddEntryPoint(
-           slangRequest,
-           translationUnitIndex,
-           entryPointInfo.name,
-           entryPointInfo.slangStage);
-       SLANG_ASSERT(entryPointIndex == ee);
+        const int entryPointSpecializationArgCount = int(request.entryPointSpecializationArgs.getCount());
+        auto setEntryPointSpecializationArgs = [&](int entryPoint)
+            {
+                for (int ii = 0; ii < entryPointSpecializationArgCount; ++ii)
+                {
+                    spSetTypeNameForEntryPointExistentialTypeParam(slangRequest, entryPoint, ii, request.entryPointSpecializationArgs[ii].getBuffer());
+                }
+            };
 
-       setEntryPointSpecializationArgs(entryPointIndex);
-   }
+        Index explicitEntryPointCount = request.entryPoints.getCount();
+        for (Index ee = 0; ee < explicitEntryPointCount; ++ee)
+        {
+            if (options.dontAddDefaultEntryPoints)
+            {
+                // If default entry points are not to be added, then
+                // the `request.entryPoints` array should have been
+                // left empty.
+                //
+                SLANG_ASSERT(false);
+            }
+
+            auto& entryPointInfo = request.entryPoints[ee];
+            int entryPointIndex = spAddEntryPoint(
+                slangRequest,
+                translationUnitIndex,
+                entryPointInfo.name,
+                entryPointInfo.slangStage);
+            SLANG_ASSERT(entryPointIndex == ee);
 
-    spSetLineDirectiveMode(slangRequest, SLANG_LINE_DIRECTIVE_MODE_NONE);
+            setEntryPointSpecializationArgs(entryPointIndex);
+        }
+
+        spSetLineDirectiveMode(slangRequest, SLANG_LINE_DIRECTIVE_MODE_NONE);
+    }
 
     const SlangResult res = spCompile(slangRequest);
 
diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp
index 55788d06b..13e6b192e 100644
--- a/tools/slang-test/slangc-tool.cpp
+++ b/tools/slang-test/slangc-tool.cpp
@@ -7,13 +7,6 @@
 
 using namespace Slang;
 
-static void _diagnosticCallback(char const* message, void* /*userData*/)
-{
-    auto stdError = StdWriters::getError();
-    stdError.put(message);
-    stdError.flush();
-}
-
 SlangResult SlangCTool::innerMain(StdWriters* stdWriters, slang::IGlobalSession* sharedSession, int argc, const char*const* argv)
 {
     StdWriters::setSingleton(stdWriters);
@@ -42,7 +35,6 @@ SlangResult SlangCTool::innerMain(StdWriters* stdWriters, slang::IGlobalSession*
         compileRequest->setWriter(channel, stdWriters->getWriter(channel));
     }
 
-    compileRequest->setDiagnosticCallback(&_diagnosticCallback, nullptr);
     compileRequest->setCommandLineCompilerMode();
 
     SLANG_RETURN_ON_FAIL(compileRequest->processCommandLineArguments(&argv[1], argc - 1));