Merge branch 'master' into feature/prelude-fix

1 files changed, 32 insertions, 32 deletions

diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index eae3bdedc..6c004c84c 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -78,7 +78,7 @@ struct CLikeSourceEmitter::ComputeEmitActionsContext
 
 /* !!!!!!!!!!!!!!!!!!!!!!!!!!!! CLikeSourceEmitter !!!!!!!!!!!!!!!!!!!!!!!!!! */
 
-/* static */CLikeSourceEmitter::SourceStyle CLikeSourceEmitter::getSourceStyle(CodeGenTarget target)
+/* static */SourceLanguage CLikeSourceEmitter::getSourceLanguage(CodeGenTarget target)
 {
     switch (target)
     {
@@ -86,17 +86,17 @@ struct CLikeSourceEmitter::ComputeEmitActionsContext
         case CodeGenTarget::Unknown:
         case CodeGenTarget::None:
         {
-            return SourceStyle::Unknown;
+            return SourceLanguage::Unknown;
         }
         case CodeGenTarget::GLSL:
         case CodeGenTarget::GLSL_Vulkan:
         case CodeGenTarget::GLSL_Vulkan_OneDesc:
         {
-            return SourceStyle::GLSL;
+            return SourceLanguage::GLSL;
         }
         case CodeGenTarget::HLSL:
         {
-            return SourceStyle::HLSL;
+            return SourceLanguage::HLSL;
         }
         case CodeGenTarget::PTX:
         case CodeGenTarget::SPIRV:
@@ -106,19 +106,19 @@ struct CLikeSourceEmitter::ComputeEmitActionsContext
         case CodeGenTarget::DXIL:
         case CodeGenTarget::DXILAssembly:
         {
-            return SourceStyle::Unknown;
+            return SourceLanguage::Unknown;
         }
         case CodeGenTarget::CSource:
         {
-            return SourceStyle::C;
+            return SourceLanguage::C;
         }
         case CodeGenTarget::CPPSource:
         {
-            return SourceStyle::CPP;
+            return SourceLanguage::CPP;
         }
         case CodeGenTarget::CUDASource:
         {
-            return SourceStyle::CUDA;
+            return SourceLanguage::CUDA;
         }
     }
 }
@@ -126,8 +126,8 @@ struct CLikeSourceEmitter::ComputeEmitActionsContext
 CLikeSourceEmitter::CLikeSourceEmitter(const Desc& desc)
 {
     m_writer = desc.sourceWriter;
-    m_sourceStyle = getSourceStyle(desc.target);
-    SLANG_ASSERT(m_sourceStyle != SourceStyle::Unknown);
+    m_sourceLanguage = getSourceLanguage(desc.target);
+    SLANG_ASSERT(m_sourceLanguage != SourceLanguage::Unknown);
 
     m_target = desc.target;
 
@@ -389,17 +389,17 @@ void CLikeSourceEmitter::maybeCloseParens(bool needClose)
 
 bool CLikeSourceEmitter::isTargetIntrinsicModifierApplicable(const String& targetName)
 {
-    switch(getSourceStyle())
+    switch(getSourceLanguage())
     {
     default:
         SLANG_DIAGNOSE_UNEXPECTED(getSink(), SourceLoc(), "unhandled code generation target");
         return false;
 
-    case SourceStyle::C:    return targetName == "c";
-    case SourceStyle::CPP:  return targetName == "cpp";
-    case SourceStyle::GLSL: return targetName == "glsl";
-    case SourceStyle::HLSL: return targetName == "hlsl";
-    case SourceStyle::CUDA: return targetName == "cuda";
+    case SourceLanguage::C:    return targetName == "c";
+    case SourceLanguage::CPP:  return targetName == "cpp";
+    case SourceLanguage::GLSL: return targetName == "glsl";
+    case SourceLanguage::HLSL: return targetName == "hlsl";
+    case SourceLanguage::CUDA: return targetName == "cuda";
     }
 }
 
@@ -552,7 +552,7 @@ String CLikeSourceEmitter::scrubName(const String& name)
     // and write some legal characters to the output as we go.
     StringBuilder sb;
 
-    if(getSourceStyle() == SourceStyle::GLSL)
+    if(getSourceLanguage() == SourceLanguage::GLSL)
     {
         // GLSL reserves all names that start with `gl_`,
         // so if we are in danger of collision, then make
@@ -667,7 +667,7 @@ String CLikeSourceEmitter::generateName(IRInst* inst)
     auto entryPointDecor = inst->findDecoration<IREntryPointDecoration>();
     if (entryPointDecor)
     {
-        if (getSourceStyle() == SourceStyle::GLSL)
+        if (getSourceLanguage() == SourceLanguage::GLSL)
         {
             // GLSL will always need to use `main` as the
             // name for an entry-point function, but other
@@ -1011,7 +1011,7 @@ bool CLikeSourceEmitter::shouldFoldInstIntoUseSites(IRInst* inst)
     // GLSL doesn't allow texture/resource types to
     // be used as first-class values, so we need
     // to fold them into their use sites in all cases
-    if (getSourceStyle() == SourceStyle::GLSL)
+    if (getSourceLanguage() == SourceLanguage::GLSL)
     {
         if(as<IRResourceTypeBase>(type))
         {
@@ -1219,12 +1219,12 @@ void CLikeSourceEmitter::emitInstResultDecl(IRInst* inst)
     {
         // "Ordinary" instructions at module scope are constants
 
-        switch (getSourceStyle())
+        switch (getSourceLanguage())
         {
-        case SourceStyle::CUDA:
-        case SourceStyle::HLSL:
-        case SourceStyle::C:
-        case SourceStyle::CPP:
+        case SourceLanguage::CUDA:
+        case SourceLanguage::HLSL:
+        case SourceLanguage::C:
+        case SourceLanguage::CPP:
             m_writer->emit("static ");
             break;
 
@@ -1652,7 +1652,7 @@ void CLikeSourceEmitter::emitIntrinsicCallExprImpl(
                         for(IRIntegerValue ii = elementCount; ii < 4; ++ii)
                         {
                             m_writer->emit(", ");
-                            if(getSourceStyle() == SourceStyle::GLSL)
+                            if(getSourceLanguage() == SourceLanguage::GLSL)
                             {
                                 emitSimpleType(elementType);
                                 m_writer->emit("(0)");
@@ -1710,7 +1710,7 @@ void CLikeSourceEmitter::emitIntrinsicCallExprImpl(
                     auto arg = args[argIndex].get();
                     if(arg->op == kIROp_ImageSubscript)
                     {
-                        if(getSourceStyle() == SourceStyle::GLSL)
+                        if(getSourceLanguage() == SourceLanguage::GLSL)
                         {
                             // TODO: we don't handle the multisample
                             // case correctly here, where the last
@@ -2003,7 +2003,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
         auto base = fieldExtract->getBase();
         emitOperand(base, leftSide(outerPrec, prec));
         m_writer->emit(".");
-        if(getSourceStyle() == SourceStyle::GLSL
+        if(getSourceLanguage() == SourceLanguage::GLSL
             && as<IRUniformParameterGroupType>(base->getDataType()))
         {
             m_writer->emit("_data.");
@@ -2023,7 +2023,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
         auto base = ii->getBase();
         emitOperand(base, leftSide(outerPrec, prec));
         m_writer->emit(".");
-        if(getSourceStyle() == SourceStyle::GLSL
+        if(getSourceLanguage() == SourceLanguage::GLSL
             && as<IRUniformParameterGroupType>(base->getDataType()))
         {
             m_writer->emit("_data.");
@@ -2120,7 +2120,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
         {
             auto base = inst->getOperand(0);
             emitOperand(base, outerPrec);
-            if(getSourceStyle() == SourceStyle::GLSL
+            if(getSourceLanguage() == SourceLanguage::GLSL
                 && as<IRUniformParameterGroupType>(base->getDataType()))
             {
                 m_writer->emit("._data");
@@ -3240,7 +3240,7 @@ void CLikeSourceEmitter::emitStruct(IRStructType* structType)
             continue;
 
         // Note: GLSL doesn't support interpolation modifiers on `struct` fields
-        if( getSourceStyle() != SourceStyle::GLSL )
+        if( getSourceLanguage() != SourceLanguage::GLSL )
         {
             emitInterpolationModifiers(fieldKey, fieldType, nullptr);
         }
@@ -3455,9 +3455,9 @@ void CLikeSourceEmitter::emitGlobalVar(IRGlobalVar* varDecl)
     // shader parameter) may need special
     // modifiers to indicate it as such.
     //
-    switch (getSourceStyle())
+    switch (getSourceLanguage())
     {
-    case SourceStyle::HLSL:
+    case SourceLanguage::HLSL:
         // HLSL requires the `static` modifier on any
         // global variables; otherwise they are assumed
         // to be uniforms.