1 files changed, 14 insertions, 11 deletions

diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index a8080851f..fa6fd2b43 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -1638,11 +1638,14 @@ void CLikeSourceEmitter::emitArgs(IRInst* inst)
     m_writer->emit(")");
 }
 
-void CLikeSourceEmitter::emitRateQualifiers(IRInst* value)
+void CLikeSourceEmitter::emitRateQualifiersAndAddressSpace(IRInst* value)
 {
-    if (IRRate* rate = value->getRate())
+    const auto rate = value->getRate();
+    const auto ptrTy = composeGetters<IRPtrTypeBase>(value, &IRInst::getDataType);
+    const auto addressSpace = ptrTy ? ptrTy->getAddressSpace() : -1;
+    if (rate || addressSpace != -1)
     {
-        emitRateQualifiersImpl(rate);
+        emitRateQualifiersAndAddressSpaceImpl(rate, addressSpace);
     }
 }
 
@@ -1657,7 +1660,7 @@ void CLikeSourceEmitter::emitInstResultDecl(IRInst* inst)
 
     emitTempModifiers(inst);
 
-    emitRateQualifiers(inst);
+    emitRateQualifiersAndAddressSpace(inst);
 
     if(as<IRModuleInst>(inst->getParent()))
     {
@@ -3138,7 +3141,7 @@ void CLikeSourceEmitter::emitSimpleFuncParamImpl(IRParam* param)
             || layout->usesResourceKind(LayoutResourceKind::VaryingOutput))
         {
             emitInterpolationModifiers(param, paramType, layout);
-            emitMeshOutputModifiers(param);
+            emitMeshShaderModifiers(param);
         }
     }
 
@@ -3514,9 +3517,9 @@ void CLikeSourceEmitter::emitInterpolationModifiers(IRInst* varInst, IRType* val
     emitInterpolationModifiersImpl(varInst, valueType, layout);
 }
 
-void CLikeSourceEmitter::emitMeshOutputModifiers(IRInst* varInst)
+void CLikeSourceEmitter::emitMeshShaderModifiers(IRInst* varInst)
 {
-    emitMeshOutputModifiersImpl(varInst);
+    emitMeshShaderModifiersImpl(varInst);
 }
 
     /// Emit modifiers that should apply even for a declaration of an SSA temporary.
@@ -3547,7 +3550,7 @@ void CLikeSourceEmitter::emitVarModifiers(IRVarLayout* layout, IRInst* varDecl,
         || layout->usesResourceKind(LayoutResourceKind::VaryingOutput))
     {
         emitInterpolationModifiers(varDecl, varType, layout);
-        emitMeshOutputModifiers(varDecl);
+        emitMeshShaderModifiers(varDecl);
     }
 
     // Output target specific qualifiers
@@ -3643,7 +3646,7 @@ void CLikeSourceEmitter::emitVar(IRVar* varDecl)
         break;
     }
 #endif
-    emitRateQualifiers(varDecl);
+    emitRateQualifiersAndAddressSpace(varDecl);
 
     emitType(varType, getName(varDecl));
 
@@ -3725,7 +3728,7 @@ void CLikeSourceEmitter::emitGlobalVar(IRGlobalVar* varDecl)
 
     emitVarModifiers(layout, varDecl, varType);
 
-    emitRateQualifiers(varDecl);
+    emitRateQualifiersAndAddressSpace(varDecl);
     emitType(varType, getName(varDecl));
 
     // TODO: These shouldn't be needed for ordinary
@@ -3788,7 +3791,7 @@ void CLikeSourceEmitter::emitGlobalParam(IRGlobalParam* varDecl)
 
     emitVarModifiers(layout, varDecl, varType);
 
-    emitRateQualifiers(varDecl);
+    emitRateQualifiersAndAddressSpace(varDecl);
     emitType(varType, getName(varDecl));
 
     emitSemantics(varDecl);