Changes for using Embedded IR Tokens (#6348)

* Changes for using Embedded IR Tokens

* Missing function

* Updating to call ShaderBuilder.DeclareStruct

Author: Chris Tchou

com.unity.shadergraph/Editor/ShaderFoundry/Utilities/Extensions.cs

@@ -73,162 +73,41 @@ internal static void AppendScopeName(this ShaderBuilder builder, Block block)
             builder.Append(blockSuffix);
         }
 
-        static void AppendTypeName(this ShaderBuilder builder, ShaderType type, Block currentScope)
-        {
-            if (currentScope == type.ParentBlock)
-                builder.Add(type.Name);
-            else
-                builder.AppendFullyQualifiedName(type);
-        }
-
         internal static void AddVariableDeclarationString(this ShaderBuilder builder, ShaderType type, string name, string defaultValue = null)
         {
-            builder.AppendFullyQualifiedName(type);
-            builder.Append(m_SpaceToken);
-            builder.Append(name);
-            if (!string.IsNullOrEmpty(defaultValue))
-                builder.Add(m_SpaceToken, m_EqualToken, m_SpaceToken, defaultValue);
+            builder.DeclareVariable(type, name, defaultValue);
         }
 
         internal static void AddVariableDeclarationStatement(this ShaderBuilder builder, ShaderType type, string name, string defaultValue = null)
         {
-            builder.Indentation();
-            builder.AddVariableDeclarationString(type, name, defaultValue);
-            builder.Add(m_SemicolonToken);
-            builder.NewLine();
+            builder.DeclareVariable(type, name, defaultValue);
         }
 
         internal static void AddVariableDeclarationStatement(this ShaderBuilder builder, Block.Builder blockBuilder, ShaderType type, string name, string defaultValue = null)
         {
-            builder.Indentation();
-
-            // There is an unfortunate ordering issue where the type's parent block is still being
-            // built that prevents this from using the other helper functions.
-            var parentBlock = type.ParentBlock;
-            if (parentBlock.IsValid && parentBlock.index != blockBuilder.blockId)
-            {
-                builder.AppendScopeName(parentBlock);
-                builder.Append(m_ScopeToken);
-            }
-            builder.Append(type.Name);
-
-            builder.Append(m_SpaceToken);
-            builder.Append(name);
-            if (!string.IsNullOrEmpty(defaultValue))
-                builder.Add(m_SpaceToken, m_EqualToken, m_SpaceToken, defaultValue);
-
-            builder.Add(m_SemicolonToken);
-            builder.NewLine();
+            builder.DeclareVariable(type, name, defaultValue);
         }
 
-        internal static void AppendFullyQualifiedName(this ShaderBuilder builder, ShaderType type)
+        internal static void AddTypeDeclarationString(this ShaderBuilder builder, ShaderType structType)
         {
-            var parentBlock = type.ParentBlock;
-            if (parentBlock.IsValid)
-            {
-                builder.AppendScopeName(parentBlock);
-                builder.Append(m_ScopeToken);
-                builder.Append(type.Name);
-                return;
-            }
-            builder.Append(type.Name);
-        }
-
-        internal static void AddTypeDeclarationString(this ShaderBuilder builder, ShaderType type)
-        {
-            builder.AddLine(m_StructKeyword, m_SpaceToken, type.Name);
-
-            using (builder.BlockSemicolonScope())
-            {
-                foreach (var field in type.StructFields)
-                {
-                    builder.Indentation();
-                    builder.AddVariableDeclarationString(field.Type, field.Name);
-                    builder.Add(m_SemicolonToken);
-                    builder.NewLine();
-                }
-            }
-        }
-
-        internal static void AppendFullyQualifiedName(this ShaderBuilder builder, ShaderFunction function)
-        {
-            var parentBlock = function.ParentBlock;
-            if (parentBlock.IsValid)
-            {
-                builder.AppendScopeName(parentBlock);
-                builder.Add(m_ScopeToken, function.Name);
-                return;
-            }
-            builder.Add(function.Name);
+            if (structType.IsStruct)
+                builder.DeclareStruct(structType);
         }
 
+        // declare function
         internal static void AddDeclarationString(this ShaderBuilder builder, ShaderFunction function)
         {
-            var parentBlock = function.ParentBlock;
-            builder.Indentation();
-            builder.AppendTypeName(function.ReturnType, parentBlock);
-            builder.Add(m_SpaceToken, function.Name, m_BeginParenthesisToken);
-
-            var paramIndex = 0;
-            foreach (var param in function.Parameters)
-            {
-                if (paramIndex != 0)
-                    builder.Add(", ");
-                if (param.IsOutput)
-                {
-                    if (param.IsInput)
-                        builder.Add(inoutKeyword, m_SpaceToken);
-                    else
-                        builder.Add(outKeyword, m_SpaceToken);
-                }
-
-                builder.AppendTypeName(param.Type, parentBlock);
-                builder.Add(m_SpaceToken, param.Name);
-                ++paramIndex;
-            }
-            builder.Add(m_EndParenthesisToken);
-            builder.NewLine();
-
-            builder.AddLine(m_BeginCurlyBraceToken);
-            builder.Indent();
-
-            builder.Add(function.Body);
-
-            builder.Deindent();
-            builder.AddLine(m_EndCurlyBraceToken);
-        }
-
-        internal static void AddCallString(this ShaderBuilder builder, ShaderFunction function, params string[] arguments)
-        {
-            // Can't yet use builder.Call due to namespacing
-            builder.AppendFullyQualifiedName(function);
-            builder.Add(m_BeginParenthesisToken);
-            for (var i = 0; i < arguments.Length; ++i)
-            {
-                builder.Add(arguments[i]);
-                if (i != arguments.Length - 1)
-                    builder.Add(m_CommaToken, m_SpaceToken);
-            }
-            builder.Add(m_EndParenthesisToken);
+            builder.DeclareFunction(function);
         }
 
         internal static void AddCallStatementWithReturn(this ShaderBuilder builder, ShaderFunction function, string returnVariableName, params string[] arguments)
         {
-            builder.Indentation();
-            builder.Add(returnVariableName);
-            builder.Add(m_SpaceToken, m_EqualToken, m_SpaceToken);
-            builder.AddCallString(function, arguments);
-            builder.Add(m_SemicolonToken);
+            builder.CallFunctionWithReturn(function, returnVariableName, arguments);
         }
 
         internal static void AddCallStatementWithNewReturn(this ShaderBuilder builder, ShaderFunction function, string returnVariableName, params string[] arguments)
         {
-            builder.Indentation();
-            builder.AddVariableDeclarationString(function.ReturnType, returnVariableName);
-            builder.Add(m_SpaceToken, m_EqualToken, m_SpaceToken);
-            builder.AddCallString(function, arguments);
-            builder.Add(m_SemicolonToken);
-            builder.NewLine();
+            builder.CallFunctionWithDeclaredReturn(function, function.ReturnType, returnVariableName, arguments);
         }
     }