Removed spGetTranslationUnitCode; Unified EntryPointResult/TranslationUnitResult, added helper functionality; Ensure null termination when printing raw data

1 files changed, 49 insertions, 19 deletions

diff --git a/source/slang/compiler.cpp b/source/slang/compiler.cpp
index 3225aafb2..c04c2150d 100644
--- a/source/slang/compiler.cpp
+++ b/source/slang/compiler.cpp
@@ -33,6 +33,33 @@
 namespace Slang
 {
 
+    // CompileResult
+
+    void CompileResult::append(CompileResult const& result)
+    {
+        // Find which to append to
+        ResultFormat appendTo = ResultFormat::None;
+
+        if (format == ResultFormat::None)
+        {
+            format = result.format;
+            appendTo = result.format;
+        }
+        else if (format == result.format)
+        {
+            appendTo = format;
+        }
+
+        if (appendTo == ResultFormat::Text)
+        {
+            outputString.append(result.outputString.Buffer());
+        }
+        else if (appendTo == ResultFormat::Binary)
+        {
+            outputBinary.AddRange(result.outputBinary.Buffer(), result.outputBinary.Count());
+        }
+    }
+
     // EntryPointRequest
 
     TranslationUnitRequest* EntryPointRequest::getTranslationUnit()
@@ -355,8 +382,11 @@ namespace Slang
 
         if (err)
         {
-            OutputDebugStringA((char const *)diagnosticOutput.Buffer());
-            fwrite(diagnosticOutput.Buffer(), 1, diagnosticOutput.Count(), stderr);
+            char const* diagnosticString = (char const*)diagnosticOutput.Buffer();
+            String debugStr(diagnosticString, diagnosticString + diagnosticOutput.Count());
+
+            OutputDebugStringA(debugStr.Buffer());
+            fprintf(stderr, "%s", debugStr.Buffer());
             exit(1);
         }
 
@@ -385,10 +415,10 @@ namespace Slang
 #endif
 
     // Do emit logic for a single entry point
-    EntryPointResult emitEntryPoint(
+    CompileResult emitEntryPoint(
         EntryPointRequest*  entryPoint)
     {
-        EntryPointResult result;
+        CompileResult result;
 
         auto compileRequest = entryPoint->compileRequest;
 
@@ -397,42 +427,42 @@ namespace Slang
         case CodeGenTarget::HLSL:
             {
                 String code = emitHLSLForEntryPoint(entryPoint);
-                result.outputSource.AddRange((uint8_t*)code.Buffer(), code.Length());
+                result = CompileResult(code);
             }
             break;
 
         case CodeGenTarget::GLSL:
             {
                 String code = emitGLSLForEntryPoint(entryPoint);
-                result.outputSource.AddRange((uint8_t*)code.Buffer(), code.Length());
+                result = CompileResult(code);
             }
             break;
 
         case CodeGenTarget::DXBytecode:
             {
                 List<uint8_t> code = EmitDXBytecodeForEntryPoint(entryPoint);
-                result.outputSource.AddRange(code.Buffer(), code.Count());
+                result = CompileResult(code);
             }
             break;
 
         case CodeGenTarget::DXBytecodeAssembly:
             {
                 List<uint8_t> code = EmitDXBytecodeAssemblyForEntryPoint(entryPoint);
-                result.outputSource.AddRange(code.Buffer(), code.Count());
+                result = CompileResult(code);
             }
             break;
 
         case CodeGenTarget::SPIRV:
             {
                 List<uint8_t> code = emitSPIRVForEntryPoint(entryPoint, false);
-                result.outputSource.AddRange(code.Buffer(), code.Count());
+                result = CompileResult(code);
             }
             break;
 
         case CodeGenTarget::SPIRVAssembly:
             {
                 List<uint8_t> code = emitSPIRVForEntryPoint(entryPoint, true);
-                result.outputSource.AddRange(code.Buffer(), code.Count());
+                result = CompileResult(code);
             }
             break;
 
@@ -449,18 +479,16 @@ namespace Slang
         }
 
         return result;
-
-
     }
 
-    TranslationUnitResult emitTranslationUnitEntryPoints(
+    CompileResult emitTranslationUnitEntryPoints(
         TranslationUnitRequest* translationUnit)
     {
-        TranslationUnitResult result;
+        CompileResult result;
 
         for (auto& entryPoint : translationUnit->entryPoints)
         {
-            EntryPointResult entryPointResult = emitEntryPoint(entryPoint.Ptr());
+            CompileResult entryPointResult = emitEntryPoint(entryPoint.Ptr());
 
             entryPoint->result = entryPointResult;
         }
@@ -468,10 +496,11 @@ namespace Slang
         // The result for the translation unit will just be the concatenation
         // of the results for each entry point. This doesn't actually make
         // much sense, but it is good enough for now.
+        //
+        // TODO: Replace this with a packaged JSON and/or binary format.
         for (auto& entryPoint : translationUnit->entryPoints)
         {
-            UInt size = entryPoint->result.outputSource.Count();
-            result.outputSource.AddRange(entryPoint->result.outputSource.Buffer(), size);
+            result.append(entryPoint->result);
         }
 
         return result;
@@ -479,7 +508,7 @@ namespace Slang
 
     // Do emit logic for an entire translation unit, which might
     // have zero or more entry points
-    TranslationUnitResult emitTranslationUnit(
+    CompileResult emitTranslationUnit(
         TranslationUnitRequest* translationUnit)
     {
         return emitTranslationUnitEntryPoints(translationUnit);
@@ -518,8 +547,9 @@ namespace Slang
         // For most targets, we will do things per-translation-unit
         for( auto translationUnit : compileRequest->translationUnits )
         {
-            TranslationUnitResult translationUnitResult = emitTranslationUnit(translationUnit.Ptr());
+            CompileResult translationUnitResult = emitTranslationUnit(translationUnit.Ptr());
             translationUnit->result = translationUnitResult;
         }
     }
+
 }