From cd8715a7760189c54b36c0c250efbe1db5b8635c Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 1 Sep 2022 09:35:18 -0400
Subject: Passing source to Downstream compilation as artifacts (#2382)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Make DownstreamCompileOptions use POD types.

* CharSliceAllocator -> SliceAllocator
Added SliceConverter
CharSliceCaster -> SliceCaster

* First attempt at zero terminating around blobs.

* Fix clang warning.

* Add SlangTerminatedChars
Make Blob implementations support it.
Make most blobs 'terminated'.

* Fix bug setting up sourceFiles for CommandLineDownstreamCompiler.

* Traffic in TerminatedCharSlice for sourceFiles.
Use ArtifactDesc to generate temporary file names for source.

* Fix typo in testing for shared library/C++.

* Working with source being passed as artifacts to DownstreamCompiler.

* Use artifacts in SourceManager/SourceFile.

* Support infering extension from the original file extension.
---
 source/compiler-core/slang-fxc-compiler.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'source/compiler-core/slang-fxc-compiler.cpp')

diff --git a/source/compiler-core/slang-fxc-compiler.cpp b/source/compiler-core/slang-fxc-compiler.cpp
index 03eaa8e34..1706f0fb0 100644
--- a/source/compiler-core/slang-fxc-compiler.cpp
+++ b/source/compiler-core/slang-fxc-compiler.cpp
@@ -182,12 +182,14 @@ static SlangResult _parseDiagnosticLine(SliceAllocator& allocator, const Unowned
 
 SlangResult FXCDownstreamCompiler::compile(const CompileOptions& options, IArtifact** outArtifact)
 {
-    // This compiler doesn't read files, they should be read externally and stored in sourceContents/sourceContentsPath
-    if (options.sourceFiles.count > 0)
+    // This compiler can only deal with a single source artifact
+    if (options.sourceArtifacts.count != 1)
     {
         return SLANG_FAIL;
     }
 
+    IArtifact* sourceArtifact = options.sourceArtifacts[0];
+
     if (options.sourceLanguage != SLANG_SOURCE_LANGUAGE_HLSL || options.targetType != SLANG_DXBC)
     {
         SLANG_ASSERT(!"Can only compile HLSL to DXBC");
@@ -207,15 +209,18 @@ SlangResult FXCDownstreamCompiler::compile(const CompileOptions& options, IArtif
         searchDirectories.searchDirectories.add(asString(includePath));
     }
 
+    const auto sourcePath = ArtifactUtil::findPath(sourceArtifact);
+
     // Use the default fileSystemExt is not set
     ID3DInclude* includeHandler = nullptr;
 
     FxcIncludeHandler fxcIncludeHandlerStorage(&searchDirectories, options.fileSystemExt, options.sourceManager);
     if (options.fileSystemExt)
     {
-        if (options.sourceContentsPath.count > 0)
+        
+        if (sourcePath.getLength() > 0)
         {
-            fxcIncludeHandlerStorage.m_rootPathInfo = PathInfo::makePath(asString(options.sourceContentsPath));
+            fxcIncludeHandlerStorage.m_rootPathInfo = PathInfo::makePath(sourcePath);
         }
         includeHandler = &fxcIncludeHandlerStorage;
     }
@@ -274,12 +279,15 @@ SlangResult FXCDownstreamCompiler::compile(const CompileOptions& options, IArtif
             break;
     }
 
+    ComPtr<ISlangBlob> sourceBlob;
+    SLANG_RETURN_ON_FAIL(sourceArtifact->loadBlob(ArtifactKeep::Yes, sourceBlob.writeRef()));
+
     ComPtr<ID3DBlob> codeBlob;
     ComPtr<ID3DBlob> diagnosticsBlob;
     HRESULT hr = m_compile(
-        options.sourceContents.begin(),
-        options.sourceContents.count,
-        options.sourceContentsPath,
+        sourceBlob->getBufferPointer(),
+        sourceBlob->getBufferSize(),
+        String(sourcePath).getBuffer(),
         dxMacros,
         includeHandler,
         options.entryPointName,
-- 
cgit v1.2.3