Add support of 'bool' to the ShaderGenerator

EvgeniiG · EvgeniiG · commit dcfce07dc904 · 2016-11-15T11:37:02.000+01:00
diff --git a/Assets/ShaderGenerator/Editor/ShaderTypeGeneration.cs b/Assets/ShaderGenerator/Editor/ShaderTypeGeneration.cs
@@ -15,7 +15,7 @@ public ShaderTypeGenerator(Type type, GenerateHLSL attr)
 
         enum PrimitiveType
         {
-            Float, Int, UInt
+            Float, Int, UInt, Bool
         };
 
         static string PrimitiveToString(PrimitiveType type, int rows, int cols)
@@ -32,6 +32,9 @@ static string PrimitiveToString(PrimitiveType type, int rows, int cols)
                 case PrimitiveType.UInt:
                     text = "uint";
                     break;
+                case PrimitiveType.Bool:
+                    text = "bool";
+                    break;
             }
 
             if (rows > 1)
@@ -171,8 +174,9 @@ void EmitMatrixType(PrimitiveType type, int rows, int cols, string name, string
         bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
         {
             var floatFields = new List<FieldInfo>();
-            var intFields = new List<FieldInfo>();
-            var uintFields = new List<FieldInfo>();
+            var intFields   = new List<FieldInfo>();
+            var uintFields  = new List<FieldInfo>();
+            var boolFields  = new List<FieldInfo>();
             var descs = new string[4] { "x: ", "y: ", "z: ", "w: " };
             int numFields = 0;
 
@@ -194,6 +198,8 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
                     intFields.Add(subField);
                 else if (subField.FieldType == typeof(uint))
                     uintFields.Add(subField);
+                else if (subField.FieldType == typeof(bool))
+                    boolFields.Add(subField);
                 else
                 {
                     Error("'" + fieldName + "' can not be packed into a register, since it contains an unsupported field type '" + subField.FieldType + "'");
@@ -216,7 +222,7 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
 
             if (floatFields.Count > 0)
             {
-                if (intFields.Count + uintFields.Count > 0)
+                if (intFields.Count + uintFields.Count + boolFields.Count > 0)
                 {
                     Error(mismatchErrorMsg);
                     return false;
@@ -225,7 +231,7 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
             }
             else if (intFields.Count > 0)
             {
-                if (floatFields.Count + uintFields.Count > 0)
+                if (floatFields.Count + uintFields.Count + boolFields.Count > 0)
                 {
                     Error(mismatchErrorMsg);
                     return false;
@@ -234,13 +240,22 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)
             }
             else if (uintFields.Count > 0)
             {
-                if (floatFields.Count + intFields.Count > 0)
+                if (floatFields.Count + intFields.Count + boolFields.Count > 0)
                 {
                     Error(mismatchErrorMsg);
                     return false;
                 }
                 EmitPrimitiveType(PrimitiveType.UInt, uintFields.Count, field.Name, "", shaderFields);
             }
+            else if (boolFields.Count > 0)
+            {
+                if (floatFields.Count + intFields.Count + uintFields.Count > 0)
+                {
+                    Error(mismatchErrorMsg);
+                    return false;
+                }
+                EmitPrimitiveType(PrimitiveType.Bool, boolFields.Count, field.Name, "", shaderFields);
+            }
             else
             {
                 // Empty struct.
@@ -476,6 +491,8 @@ public bool Generate()
                         EmitPrimitiveType(PrimitiveType.Int, 1, field.Name, "", m_ShaderFields);
                     else if (field.FieldType == typeof(uint))
                         EmitPrimitiveType(PrimitiveType.UInt, 1, field.Name, "", m_ShaderFields);
+                        else if (field.FieldType == typeof(bool))
+                        EmitPrimitiveType(PrimitiveType.Bool, 1, field.Name, "", m_ShaderFields);
                     else
                     {
                         Error("unsupported field type '" + field.FieldType + "'");

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public ShaderTypeGenerator(Type type, GenerateHLSL attr)`
`15`	`15`
`16`	`16`	`enum PrimitiveType`
`17`	`17`	`{`
`18`		`- Float, Int, UInt`
	`18`	`+ Float, Int, UInt, Bool`
`19`	`19`	`};`
`20`	`20`
`21`	`21`	`static string PrimitiveToString(PrimitiveType type, int rows, int cols)`
`@@ -32,6 +32,9 @@ static string PrimitiveToString(PrimitiveType type, int rows, int cols)`
`32`	`32`	`case PrimitiveType.UInt:`
`33`	`33`	`text = "uint";`
`34`	`34`	`break;`
	`35`	`+ case PrimitiveType.Bool:`
	`36`	`+ text = "bool";`
	`37`	`+ break;`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`if (rows > 1)`
`@@ -171,8 +174,9 @@ void EmitMatrixType(PrimitiveType type, int rows, int cols, string name, string`
`171`	`174`	`bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)`
`172`	`175`	`{`
`173`	`176`	`var floatFields = new List<FieldInfo>();`
`174`		`- var intFields = new List<FieldInfo>();`
`175`		`- var uintFields = new List<FieldInfo>();`
	`177`	`+ var intFields = new List<FieldInfo>();`
	`178`	`+ var uintFields = new List<FieldInfo>();`
	`179`	`+ var boolFields = new List<FieldInfo>();`
`176`	`180`	`var descs = new string[4] { "x: ", "y: ", "z: ", "w: " };`
`177`	`181`	`int numFields = 0;`
`178`	`182`
`@@ -194,6 +198,8 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)`
`194`	`198`	`intFields.Add(subField);`
`195`	`199`	`else if (subField.FieldType == typeof(uint))`
`196`	`200`	`uintFields.Add(subField);`
	`201`	`+ else if (subField.FieldType == typeof(bool))`
	`202`	`+ boolFields.Add(subField);`
`197`	`203`	`else`
`198`	`204`	`{`
`199`	`205`	`Error("'" + fieldName + "' can not be packed into a register, since it contains an unsupported field type '" + subField.FieldType + "'");`
`@@ -216,7 +222,7 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)`
`216`	`222`
`217`	`223`	`if (floatFields.Count > 0)`
`218`	`224`	`{`
`219`		`- if (intFields.Count + uintFields.Count > 0)`
	`225`	`+ if (intFields.Count + uintFields.Count + boolFields.Count > 0)`
`220`	`226`	`{`
`221`	`227`	`Error(mismatchErrorMsg);`
`222`	`228`	`return false;`
`@@ -225,7 +231,7 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)`
`225`	`231`	`}`
`226`	`232`	`else if (intFields.Count > 0)`
`227`	`233`	`{`
`228`		`- if (floatFields.Count + uintFields.Count > 0)`
	`234`	`+ if (floatFields.Count + uintFields.Count + boolFields.Count > 0)`
`229`	`235`	`{`
`230`	`236`	`Error(mismatchErrorMsg);`
`231`	`237`	`return false;`
`@@ -234,13 +240,22 @@ bool ExtractComplex(FieldInfo field, List<ShaderFieldInfo> shaderFields)`
`234`	`240`	`}`
`235`	`241`	`else if (uintFields.Count > 0)`
`236`	`242`	`{`
`237`		`- if (floatFields.Count + intFields.Count > 0)`
	`243`	`+ if (floatFields.Count + intFields.Count + boolFields.Count > 0)`
`238`	`244`	`{`
`239`	`245`	`Error(mismatchErrorMsg);`
`240`	`246`	`return false;`
`241`	`247`	`}`
`242`	`248`	`EmitPrimitiveType(PrimitiveType.UInt, uintFields.Count, field.Name, "", shaderFields);`
`243`	`249`	`}`
	`250`	`+ else if (boolFields.Count > 0)`
	`251`	`+ {`
	`252`	`+ if (floatFields.Count + intFields.Count + uintFields.Count > 0)`
	`253`	`+ {`
	`254`	`+ Error(mismatchErrorMsg);`
	`255`	`+ return false;`
	`256`	`+ }`
	`257`	`+ EmitPrimitiveType(PrimitiveType.Bool, boolFields.Count, field.Name, "", shaderFields);`
	`258`	`+ }`
`244`	`259`	`else`
`245`	`260`	`{`
`246`	`261`	`// Empty struct.`
`@@ -476,6 +491,8 @@ public bool Generate()`
`476`	`491`	`EmitPrimitiveType(PrimitiveType.Int, 1, field.Name, "", m_ShaderFields);`
`477`	`492`	`else if (field.FieldType == typeof(uint))`
`478`	`493`	`EmitPrimitiveType(PrimitiveType.UInt, 1, field.Name, "", m_ShaderFields);`
	`494`	`+ else if (field.FieldType == typeof(bool))`
	`495`	`+ EmitPrimitiveType(PrimitiveType.Bool, 1, field.Name, "", m_ShaderFields);`
`479`	`496`	`else`
`480`	`497`	`{`
`481`	`498`	`Error("unsupported field type '" + field.FieldType + "'");`