Merge https://github.com/shader-slang/slang

3 files changed, 57 insertions, 0 deletions

diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index da9489a75..f76ab1db1 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -5091,6 +5091,37 @@ emitDeclImpl(decl, nullptr);
         EmitContext*    context,
         IRValue*         inst)
     {
+        // Don't emit semantics if we aren't translating down to HLSL
+        switch (context->shared->target)
+        {
+        case CodeGenTarget::HLSL:
+            break;
+
+        default:
+            return;
+        }
+
+        if(auto layoutDecoration = inst->findDecoration<IRLayoutDecoration>())
+        {
+            if(auto varLayout = layoutDecoration->layout.As<VarLayout>())
+            {
+                if(varLayout->flags & VarLayoutFlag::HasSemantic)
+                {
+                    Emit(" : ");
+                    emit(varLayout->semanticName);
+                    if(varLayout->semanticIndex)
+                    {
+                        Emit(varLayout->semanticIndex);
+                    }
+
+                    return;
+                }
+            }
+        }
+
+        // TODO(tfoley): should we ever need to use the high-level declaration
+        // for this? It seems like the wrong approach...
+
         auto decoration = inst->findDecoration<IRHighLevelDeclDecoration>();
         if( decoration )
         {
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 4bf9de5d3..14639de7e 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -3094,6 +3094,31 @@ namespace Slang
             clonedFunc,
             entryPointLayout);
 
+        // We will also go on and attach layout information
+        // to the function parameters, so that we have it
+        // available directly on the parameters, rather
+        // than having to look it up on the original entry-point layout.
+        if( auto firstBlock = clonedFunc->getFirstBlock() )
+        {
+            UInt paramLayoutCount = entryPointLayout->fields.Count();
+            UInt paramCounter = 0;
+            for( auto pp = firstBlock->getFirstParam(); pp; pp = pp->getNextParam() )
+            {
+                UInt paramIndex = paramCounter++;
+                if( paramIndex < paramLayoutCount )
+                {
+                    auto paramLayout = entryPointLayout->fields[paramIndex];
+                    context->builder->addLayoutDecoration(
+                        pp,
+                        paramLayout);
+                }
+                else
+                {
+                    SLANG_UNEXPECTED("too many parameters");
+                }
+            }
+        }
+
         return clonedFunc;
     }
 
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index dff322c29..da7601d41 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -918,6 +918,7 @@ SLANG_API int spCompile(
     catch (...)
     {
         req->mSink.diagnose(Slang::SourceLoc(), Slang::Diagnostics::compilationAborted);
+        req->mDiagnosticOutput = req->mSink.outputBuffer.ProduceString();
         return 1;
     }
 #else