[Bind] 1.1 compatibility with string[] overloads

thefiddler · Jun 10, 2014 · b80f14b · b80f14b
1 parent ba764be
commit b80f14b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/Source/Bind/ES/ES2Generator.cs b/Source/Bind/ES/ES2Generator.cs
@@ -31,6 +31,8 @@ public ES2Generator(Settings settings, string dirName)
             // overloads using the "All" enum in addition to strongly-typed enums.
             // This can be disabled by passing "-o:-keep_untyped_enums" as a cmdline parameter.
             Settings.DefaultCompatibility |= Settings.Legacy.KeepUntypedEnums;
+            Settings.DefaultCompatibility |=
+                Settings.Legacy.KeepStringArrayOverloads;
         }
     }
 }
diff --git a/Source/Bind/ES/ES3Generator.cs b/Source/Bind/ES/ES3Generator.cs
@@ -31,6 +31,8 @@ public ES3Generator(Settings settings, string dirName)
             // overloads using the "All" enum in addition to strongly-typed enums.
             // This can be disabled by passing "-o:-keep_untyped_enums" as a cmdline parameter.
             Settings.DefaultCompatibility |= Settings.Legacy.KeepUntypedEnums;
+            Settings.DefaultCompatibility |=
+                Settings.Legacy.KeepStringArrayOverloads;
         }
     }
 }
diff --git a/Source/Bind/ES/ESGenerator.cs b/Source/Bind/ES/ESGenerator.cs
@@ -34,6 +34,8 @@ public ESGenerator(Settings settings, string dirName)
             // overloads using the "All" enum in addition to strongly-typed enums.
             // This can be disabled by passing "-o:-keep_untyped_enums" as a cmdline parameter.
             Settings.DefaultCompatibility |= Settings.Legacy.KeepUntypedEnums;
+            Settings.DefaultCompatibility |=
+                Settings.Legacy.KeepStringArrayOverloads;
         }
     }
 }
diff --git a/Source/Bind/GL2/GL2Generator.cs b/Source/Bind/GL2/GL2Generator.cs
@@ -57,8 +57,8 @@ public GL2Generator(Settings settings, string dirname)
             Settings.DefaultDocPath = Path.Combine(
                 Settings.DefaultDocPath, "GL");
 
-            //Settings.DefaultCompatibility |=
-            //    Settings.Legacy.UseDllImports | Settings.Legacy.UseWindowsCompatibleGL;
+            Settings.DefaultCompatibility |=
+                Settings.Legacy.KeepStringArrayOverloads;
         }
     }
 }

diff --git a/Source/Bind/GL2/GL4Generator.cs b/Source/Bind/GL2/GL4Generator.cs
@@ -49,8 +49,8 @@ public GL4Generator(Settings settings, string dirname)
 
             Profile = "glcore";
 
-            //Settings.DefaultCompatibility |=
-            //    Settings.Legacy.UseDllImports | Settings.Legacy.UseWindowsCompatibleGL;
+            Settings.DefaultCompatibility |=
+                Settings.Legacy.KeepStringArrayOverloads;
         }
     }
 }
diff --git a/Source/Bind/Settings.cs b/Source/Bind/Settings.cs
@@ -177,6 +177,11 @@ public enum Legacy
             /// of the generated bindings.
             /// </summary>
             NoUnsignedOverloads = 0x40000,
+            /// <summary>
+            /// Generates string[] overloads for each ref string / out string parameter.
+            /// Use this option to maintain compatibility with the 1.0/1.1 GL and ES APIs.
+            /// </summary>
+            KeepStringArrayOverloads = 0x80000,
             Tao = ConstIntEnums |
                   NoAdvancedEnumProcessing |
                   NoPublicUnsafeFunctions |