Skip to content
This repository
Browse code

Merge branch 'enumfix'

  • Loading branch information...
commit 19d9beb6a4dfde3704d9f4c11070b71d0af034e8 2 parents b977ff1 + 0b5f03c
thefiddler authored
71 Source/Bind/FuncProcessor.cs
@@ -85,7 +85,6 @@ public FuncProcessor(IBind generator, string overrides)
85 85 foreach (var d in signatures)
86 86 {
87 87 var replace = GetFuncOverride(nav, d, apiname, apiversion);
88   -
89 88 TranslateExtension(d);
90 89 TranslateReturnType(d, replace, nav, enum_processor, enums, apiname, version);
91 90 TranslateParameters(d, replace, nav, enum_processor, enums, apiname, version);
@@ -114,12 +113,12 @@ public FuncProcessor(IBind generator, string overrides)
114 113 }
115 114 }
116 115
117   - Console.WriteLine("Generating convenience overloads.");
118   - delegates.AddRange(CreateConvenienceOverloads(delegates));
119   -
120 116 Console.WriteLine("Generating wrappers.");
121 117 var wrappers = CreateWrappers(delegates, enums);
122 118
  119 + Console.WriteLine("Generating convenience overloads.");
  120 + wrappers.AddRange(CreateConvenienceOverloads(wrappers));
  121 +
123 122 Console.WriteLine("Generating CLS compliant overloads.");
124 123 wrappers = CreateCLSCompliantWrappers(wrappers, enums);
125 124
@@ -215,8 +214,11 @@ static string GetOverridesPath(string apiname, string apiversion, string functio
215 214 category = enum_processor.TranslateEnumName(category);
216 215
217 216 // Try to find out if it is an enum. If the type exists in the normal GLEnums list, use this.
218   - // Special case for Boolean - it is an enum, but it is dumb to use that instead of the 'bool' type.
219   - bool normal = enums.TryGetValue(type.CurrentType, out @enum);
  217 + // Special case for Boolean which is there simply because C89 does not support bool types.
  218 + // We don't really need that in C#
  219 + bool normal =
  220 + enums.TryGetValue(type.CurrentType, out @enum) ||
  221 + enums.TryGetValue(enum_processor.TranslateEnumName(type.CurrentType), out @enum);
220 222
221 223 // Translate enum types
222 224 type.IsEnum = false;
@@ -233,7 +235,9 @@ static string GetOverridesPath(string apiname, string apiversion, string functio
233 235 // Some functions and enums have the same names.
234 236 // Make sure we reference the enums rather than the functions.
235 237 if (normal)
236   - type.QualifiedType = type.CurrentType.Insert(0, String.Format("{0}.", Settings.EnumsOutput));
  238 + {
  239 + type.QualifiedType = String.Format("{0}.{1}", Settings.EnumsOutput, @enum.Name);
  240 + }
237 241 }
238 242 }
239 243 else if (Generator.GLTypes.TryGetValue(type.CurrentType, out s))
@@ -328,7 +332,7 @@ static string TranslateExtension(string extension)
328 332 }
329 333 return extension;
330 334 }
331   -
  335 +
332 336 void TranslateExtension(Delegate d)
333 337 {
334 338 d.Extension = TranslateExtension(d.Extension);
@@ -382,16 +386,6 @@ static string GetTrimmedName(Delegate d)
382 386 }
383 387 }
384 388
385   - // If we have a convenience overload, we should turn the name from
386   - // plural into singular
387   - if (d.ReturnType.WrapperType == WrapperTypes.ConvenienceReturnType ||
388   - d.ReturnType.WrapperType == WrapperTypes.ConvenienceArrayReturnType ||
389   - d.Parameters.Any(p => p.WrapperType == WrapperTypes.ConvenienceArrayType))
390   - {
391   - trimmed_name = trimmed_name.Replace("Queries", "Query");
392   - trimmed_name = trimmed_name.TrimEnd('s');
393   - }
394   -
395 389 return trimmed_name;
396 390 }
397 391
@@ -511,7 +505,7 @@ static void ApplyReturnTypeReplacement(Delegate d, XPathNavigator function_overr
511 505 {
512 506 ApplyReturnTypeReplacement(d, function_override);
513 507
514   - TranslateType(d.ReturnType, function_override, nav, enum_processor,enums, d.Category, apiname);
  508 + TranslateType(d.ReturnType, function_override, nav, enum_processor, enums, d.Category, apiname);
515 509
516 510 if (d.ReturnType.CurrentType.ToLower().Contains("void") && d.ReturnType.Pointer != 0)
517 511 {
@@ -608,7 +602,7 @@ Delegate GetCLSCompliantDelegate(Delegate d)
608 602 }
609 603 else if (p.CurrentType.ToLower().Contains("void") ||
610 604 (!String.IsNullOrEmpty(p.PreviousType) && p.PreviousType.ToLower().Contains("void")))
611   - //|| CurrentType.Contains("IntPtr"))
  605 + //|| CurrentType.Contains("IntPtr"))
612 606 {
613 607 p.CurrentType = "IntPtr";
614 608 p.Pointer = 0;
@@ -846,17 +840,17 @@ IEnumerable<Function> CreateNormalWrappers(Delegate d, EnumCollection enums)
846 840 }
847 841 }
848 842
849   - IEnumerable<Delegate> CreateConvenienceOverloads(DelegateCollection delegates)
  843 + IEnumerable<Function> CreateConvenienceOverloads(FunctionCollection wrappers)
850 844 {
851   - foreach (var list in delegates.Values)
  845 + var convenience_wrappers = new List<Function>();
  846 + foreach (var d in wrappers.Values.SelectMany(w => w))
852 847 {
853   - var d = list.First();
854 848 if (d.Parameters.Count > 0 && d.Parameters.Count <= 2)
855 849 {
856 850 var p = d.Parameters.Last();
857 851 var r = d.ReturnType;
858 852
859   - var name = GetTrimmedName(d);
  853 + var name = d.Name;
860 854
861 855 bool is_candidate = true;
862 856 is_candidate &=
@@ -869,28 +863,41 @@ IEnumerable<Delegate> CreateConvenienceOverloads(DelegateCollection delegates)
869 863 is_candidate &= p.ElementCount == 0 || p.ElementCount == 1;
870 864 is_candidate &= r.CurrentType == "void" && r.Pointer == 0;
871 865
  866 + Function f = null;
872 867 if (is_candidate && p.Flow == FlowDirection.Out)
873 868 {
874 869 // Match Gen*|Get*|New*([Out] int[] names) methods
875   - var f = CreateReturnTypeConvenienceWrapper(d);
876   - yield return f;
  870 + f = CreateReturnTypeConvenienceWrapper(d);
877 871 }
878 872 else if (is_candidate && p.Flow != FlowDirection.Out)
879 873 {
880 874 // Match *Delete(int count, int[] names) methods
881 875 if (d.Parameters.Count == 2)
882 876 {
883   - var f = CreateArrayReturnTypeConvencienceWrapper(d);
884   - yield return f;
  877 + f = CreateArrayReturnTypeConvenienceWrapper(d);
  878 + }
  879 + }
  880 +
  881 + if (f != null)
  882 + {
  883 + // If we have a convenience overload, we should turn its name from
  884 + // plural into singular
  885 + if (f.ReturnType.WrapperType == WrapperTypes.ConvenienceReturnType ||
  886 + f.ReturnType.WrapperType == WrapperTypes.ConvenienceArrayReturnType ||
  887 + f.Parameters.Any(t => t.WrapperType == WrapperTypes.ConvenienceArrayType))
  888 + {
  889 + f.TrimmedName = f.TrimmedName.Replace("Queries", "Query").TrimEnd('s');
885 890 }
  891 + convenience_wrappers.Add(f);
886 892 }
887 893 }
888 894 }
  895 + return convenience_wrappers;
889 896 }
890 897
891   - static Delegate CreateReturnTypeConvenienceWrapper(Delegate d)
  898 + static Function CreateReturnTypeConvenienceWrapper(Function d)
892 899 {
893   - var f = new Delegate(d);
  900 + var f = new Function(d);
894 901 f.ReturnType = new Type(f.Parameters.Last());
895 902 f.ReturnType.Pointer = 0;
896 903 f.Parameters.RemoveAt(f.Parameters.Count - 1);
@@ -908,9 +915,9 @@ static Delegate CreateReturnTypeConvenienceWrapper(Delegate d)
908 915 return f;
909 916 }
910 917
911   - static Delegate CreateArrayReturnTypeConvencienceWrapper(Delegate d)
  918 + static Function CreateArrayReturnTypeConvenienceWrapper(Function d)
912 919 {
913   - var f = new Delegate(d);
  920 + var f = new Function(d);
914 921 var p_array = f.Parameters.Last();
915 922 var p_size = f.Parameters[f.Parameters.Count - 2];
916 923 f.Parameters.RemoveAt(f.Parameters.Count - 2);
201 Source/Bind/Specifications/GL2/overrides.xml
@@ -1956,6 +1956,207 @@
1956 1956 <type>BeginMode</type>
1957 1957 </param>
1958 1958 </function>
  1959 + <function name="GetBufferParameter" extension="Arb" obsolete="Use BufferTargetArb overload instead">
  1960 + <param name="target" index="0">
  1961 + <type>ArbVertexBufferObject</type>
  1962 + </param>
  1963 + </function>
  1964 + <function name="GetBufferPointer" extension="Arb" obsolete="Use BufferTargetArb overload instead">
  1965 + <param name="target" index="0">
  1966 + <type>ArbVertexBufferObject</type>
  1967 + </param>
  1968 + </function>
  1969 + <function name="MapBuffer" extension="Arb" obsolete="Use BufferAccessArb overload instead">
  1970 + <param name="access" index="1">
  1971 + <type>ArbVertexBufferObject</type>
  1972 + </param>
  1973 + </function>
  1974 + <function name="BlendEquationSeparate" extension="Ext" obsolete="Use BlendEquationModeExt overload instead">
  1975 + <param name="modeRGB" index="0">
  1976 + <type>ExtBlendEquationSeparate</type>
  1977 + </param>
  1978 + <param name="modeAlpha" index="1">
  1979 + <type>ExtBlendEquationSeparate</type>
  1980 + </param>
  1981 + </function>
  1982 + <function name="ConvolutionFilter1D" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  1983 + <param name="target" index="0">
  1984 + <type>ExtConvolution</type>
  1985 + </param>
  1986 + </function>
  1987 + <function name="ConvolutionFilter2D" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  1988 + <param name="target" index="0">
  1989 + <type>ExtConvolution</type>
  1990 + </param>
  1991 + </function>
  1992 + <function name="ConvolutionParameter" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  1993 + <param name="target" index="0">
  1994 + <type>ExtConvolution</type>
  1995 + </param>
  1996 + <param name="pname" index="1">
  1997 + <type>ExtConvolution</type>
  1998 + </param>
  1999 + </function>
  2000 + <function name="CopyConvolutionFilter1D" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  2001 + <param name="target" index="0">
  2002 + <type>ExtConvolution</type>
  2003 + </param>
  2004 + </function>
  2005 + <function name="CopyConvolutionFilter2D" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  2006 + <param name="target" index="0">
  2007 + <type>ExtConvolution</type>
  2008 + </param>
  2009 + </function>
  2010 + <function name="FogCoordPointer" extension="Ext" obsolete="Use FogPointerTypeExt overload instead">
  2011 + <param name="type" index="0">
  2012 + <type>ExtFogCoord</type>
  2013 + </param>
  2014 + </function>
  2015 + <function name="GetConvolutionFilter" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  2016 + <param name="target" index="0">
  2017 + <type>ExtConvolution</type>
  2018 + </param>
  2019 + </function>
  2020 + <function name="GetConvolutionParameter" extension="Ext" obsolete="Use ConvolutionTargetExt overload instead">
  2021 + <param name="target" index="0">
  2022 + <type>ExtConvolution</type>
  2023 + </param>
  2024 + <param name="pname" index="1">
  2025 + <type>ExtConvolution</type>
  2026 + </param>
  2027 + </function>
  2028 + <function name="GetHistogram" extension="Ext" obsolete="Use HistogramTargetExt overload instead">
  2029 + <param name="target" index="0">
  2030 + <type>ExtHistogram</type>
  2031 + </param>
  2032 + </function>
  2033 + <function name="GetHistogramParameter" extension="Ext" obsolete="Use HistogramTargetExt overload instead">
  2034 + <param name="target" index="0">
  2035 + <type>ExtHistogram</type>
  2036 + </param>
  2037 + <param name="pname" index="1">
  2038 + <type>ExtHistogram</type>
  2039 + </param>
  2040 + </function>
  2041 + <function name="GetMinmax" extension="Ext" obsolete="Use MinmaxTargetExt overload instead">
  2042 + <param name="target" index="0">
  2043 + <type>ExtHistogram</type>
  2044 + </param>
  2045 + </function>
  2046 + <function name="GetMinmaxParameter" extension="Ext" obsolete="Use MinmaxTargetExt overload instead">
  2047 + <param name="target" index="0">
  2048 + <type>ExtHistogram</type>
  2049 + </param>
  2050 + <param name="pname" index="1">
  2051 + <type>ExtHistogram</type>
  2052 + </param>
  2053 + </function>
  2054 + <function name="Histogram" extension="Ext" obsolete="Use HistogramTargetExt overload instead">
  2055 + <param name="target" index="0">
  2056 + <type>ExtHistogram</type>
  2057 + </param>
  2058 + </function>
  2059 + <function name="Minmax" extension="Ext" obsolete="Use MinmaxTargetExt overload instead">
  2060 + <param name="target" index="0">
  2061 + <type>ExtHistogram</type>
  2062 + </param>
  2063 + </function>
  2064 + <function name="ResetHistogram" extension="Ext" obsolete="Use HistogramTargetExt overload instead">
  2065 + <param name="target" index="0">
  2066 + <type>ExtHistogram</type>
  2067 + </param>
  2068 + </function>
  2069 + <function name="ResetMinmax" extension="Ext" obsolete="Use MinmaxTargetExt overload instead">
  2070 + <param name="target" index="0">
  2071 + <type>ExtHistogram</type>
  2072 + </param>
  2073 + </function>
  2074 + <function name="BindTransformFeedback" extension="NV" obsolete="Use BufferTargetArb overload instead">
  2075 + <param name="target" index="0">
  2076 + <type>NvTransformFeedback2</type>
  2077 + </param>
  2078 + </function>
  2079 + <function name="ColorTable" extension="Sgi" obsolete="Use ColorTableTargetSgi overload instead">
  2080 + <param name="target" index="0">
  2081 + <type>SgiColorTable</type>
  2082 + </param>
  2083 + </function>
  2084 + <function name="ColorTableParameter" extension="Sgi" obsolete="Use ColorTableTargetSgi overload instead">
  2085 + <param name="target" index="0">
  2086 + <type>SgiColorTable</type>
  2087 + </param>
  2088 + <param name="pname" index="1">
  2089 + <type>SgiColorTable</type>
  2090 + </param>
  2091 + </function>
  2092 + <function name="CopyColorTable" extension="Sgi" obsolete="Use ColorTableTargetSgi overload instead">
  2093 + <param name="target" index="0">
  2094 + <type>SgiColorTable</type>
  2095 + </param>
  2096 + </function>
  2097 + <function name="GetColorTable" extension="Sgi" obsolete="Use ColorTableTargetSgi overload instead">
  2098 + <param name="target" index="0">
  2099 + <type>SgiColorTable</type>
  2100 + </param>
  2101 + </function>
  2102 + <function name="GetColorTableParameter" extension="Sgi" obsolete="Use ColorTableTargetSgi overload instead">
  2103 + <param name="target" index="0">
  2104 + <type>SgiColorTable</type>
  2105 + </param>
  2106 + <param name="pname" index="1">
  2107 + <type>SgiColorTable</type>
  2108 + </param>
  2109 + </function>
  2110 + <function name="GetPixelTexGenParameter" extension="Sgis" obsolete="Use PixelTexGenParameterNameSgis overload instead">
  2111 + <param name="pname" index="0">
  2112 + <type>SgisPixelTexture</type>
  2113 + </param>
  2114 + </function>
  2115 + <function name="PixelTexGenParameter" extension="Sgis" obsolete="Use PixelTexGenParameterNameSgis overload instead">
  2116 + <param name="pname" index="0">
  2117 + <type>SgisPixelTexture</type>
  2118 + </param>
  2119 + </function>
  2120 + <function name="SamplePattern" extension="Sgis" obsolete="Use SamplePatternSgis overload instead">
  2121 + <param name="pattern" index="0">
  2122 + <type>SgisMultisample</type>
  2123 + </param>
  2124 + </function>
  2125 + <function name="Deform" extension="Sgix" obsolete="Use FfdMaskSgix overload instead">
  2126 + <param name="mask" index="0">
  2127 + <type>int</type>
  2128 + </param>
  2129 + </function>
  2130 + <function name="Deform" extension="Sgix" obsolete="Use FfdMaskSgix overload instead">
  2131 + <param name="mask" index="0">
  2132 + <type>uint</type>
  2133 + </param>
  2134 + </function>
  2135 + <function name="DeformationMap3" extension="Sgix" obsolete="Use FfdTargetSgix overload instead">
  2136 + <param name="target" index="0">
  2137 + <type>SgixPolynomialFfd</type>
  2138 + </param>
  2139 + </function>
  2140 + <function name="FragmentLightModel" extension="Sgix" obsolete="Use FragmentLightModelParameterSgix overload instead">
  2141 + <param name="pname" index="0">
  2142 + <type>SgixFragmentLighting</type>
  2143 + </param>
  2144 + </function>
  2145 + <function name="LightEnv" extension="Sgix" obsolete="Use LightEnvParameterSgix overload instead">
  2146 + <param name="pname" index="0">
  2147 + <type>SgixFragmentLighting</type>
  2148 + </param>
  2149 + </function>
  2150 + <function name="LoadIdentityDeformationMap" extension="Sgix" obsolete="Use FfdMaskSgix overload instead">
  2151 + <param name="mask" index="0">
  2152 + <type>int</type>
  2153 + </param>
  2154 + </function>
  2155 + <function name="LoadIdentityDeformationMap" extension="Sgix" obsolete="Use FfdMaskSgix overload instead">
  2156 + <param name="mask" index="0">
  2157 + <type>uint</type>
  2158 + </param>
  2159 + </function>
1959 2160
1960 2161 <!-- added manually -->
1961 2162 <function name="BlendFunc" extension="Core" obsolete="Use BlendingFactorSrc overload instead">
143 Source/Bind/Specifications/GL2/signatures.xml
@@ -74,6 +74,14 @@
74 74 <token name="VERTEX_ARRAY_OBJECT_AMD" value="0x9154" />
75 75 <token name="SAMPLER_OBJECT_AMD" value="0x9155" />
76 76 </enum>
  77 + <enum name="AMD_occlusion_query_event">
  78 + <token name="OCCLUSION_QUERY_EVENT_MASK_AMD" value="0x874F" />
  79 + <token name="QUERY_DEPTH_PASS_EVENT_BIT_AMD" value="0x00000001" />
  80 + <token name="QUERY_DEPTH_FAIL_EVENT_BIT_AMD" value="0x00000002" />
  81 + <token name="QUERY_STENCIL_FAIL_EVENT_BIT_AMD" value="0x00000004" />
  82 + <token name="QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD" value="0x00000008" />
  83 + <token name="QUERY_ALL_EVENT_BITS_AMD" value="0xFFFFFFFF" />
  84 + </enum>
77 85 <enum name="AMD_performance_monitor">
78 86 <token name="COUNTER_TYPE_AMD" value="0x8BC0" />
79 87 <token name="COUNTER_RANGE_AMD" value="0x8BC1" />
@@ -3370,6 +3378,10 @@
3370 3378 <token name="GEOMETRY_DEFORMATION_SGIX" value="0x8194" />
3371 3379 <token name="TEXTURE_DEFORMATION_SGIX" value="0x8195" />
3372 3380 </enum>
  3381 + <enum name="FogCoordinatePointerType">
  3382 + <token name="FLOAT" value="0x1406" />
  3383 + <token name="DOUBLE" value="0x140A" />
  3384 + </enum>
3373 3385 <enum name="FogMode">
3374 3386 <token name="EXP" value="0x0800" deprecated="3.2" />
3375 3387 <token name="EXP2" value="0x0801" deprecated="3.2" />
@@ -3385,6 +3397,14 @@
3385 3397 <token name="FOG_OFFSET_VALUE_SGIX" value="0x8199" />
3386 3398 <token name="FOG_START" value="0x0B63" deprecated="3.2" />
3387 3399 </enum>
  3400 + <enum name="FogPointerTypeEXT">
  3401 + <token name="FLOAT" value="0x1406" />
  3402 + <token name="DOUBLE" value="0x140A" />
  3403 + </enum>
  3404 + <enum name="FogPointerTypeIBM">
  3405 + <token name="FLOAT" value="0x1406" />
  3406 + <token name="DOUBLE" value="0x140A" />
  3407 + </enum>
3388 3408 <enum name="FragmentLightModelParameterSGIX">
3389 3409 <token name="FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX" value="0x840A" />
3390 3410 <token name="FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX" value="0x8408" />
@@ -4519,16 +4539,9 @@
4519 4539 <enum name="NV_bindless_multi_draw_indirect" />
4520 4540 <enum name="NV_bindless_texture" />
4521 4541 <enum name="NV_blend_equation_advanced">
4522   - <token name="BLUE_NV" value="0x1905" />
4523   - <token name="GREEN_NV" value="0x1904" />
4524   - <token name="RED_NV" value="0x1903" />
4525   - <token name="XOR_NV" value="0x1506" />
4526   - <token name="BLUE" value="0x1905" />
4527   - <token name="GREEN" value="0x1904" />
4528   - <token name="RED" value="0x1903" />
4529   - <token name="XOR" value="0x1506" />
4530 4542 <token name="BLEND_OVERLAP_NV" value="0x9281" />
4531 4543 <token name="BLEND_PREMULTIPLIED_SRC_NV" value="0x9280" />
  4544 + <token name="BLUE_NV" value="0x1905" />
4532 4545 <token name="COLORBURN_NV" value="0x929A" />
4533 4546 <token name="COLORDODGE_NV" value="0x9299" />
4534 4547 <token name="CONJOINT_NV" value="0x9284" />
@@ -4542,6 +4555,7 @@
4542 4555 <token name="DST_OUT_NV" value="0x928D" />
4543 4556 <token name="DST_OVER_NV" value="0x9289" />
4544 4557 <token name="EXCLUSION_NV" value="0x92A0" />
  4558 + <token name="GREEN_NV" value="0x1904" />
4545 4559 <token name="HARDLIGHT_NV" value="0x929B" />
4546 4560 <token name="HARDMIX_NV" value="0x92A9" />
4547 4561 <token name="HSL_COLOR_NV" value="0x92AF" />
@@ -4564,6 +4578,7 @@
4564 4578 <token name="PLUS_CLAMPED_NV" value="0x92B1" />
4565 4579 <token name="PLUS_DARKER_NV" value="0x9292" />
4566 4580 <token name="PLUS_NV" value="0x9291" />
  4581 + <token name="RED_NV" value="0x1903" />
4567 4582 <token name="SCREEN_NV" value="0x9295" />
4568 4583 <token name="SOFTLIGHT_NV" value="0x929C" />
4569 4584 <token name="SRC_ATOP_NV" value="0x928E" />
@@ -4573,6 +4588,7 @@
4573 4588 <token name="SRC_OVER_NV" value="0x9288" />
4574 4589 <token name="UNCORRELATED_NV" value="0x9282" />
4575 4590 <token name="VIVIDLIGHT_NV" value="0x92A6" />
  4591 + <token name="XOR_NV" value="0x1506" />
4576 4592 <token name="ZERO" value="0" />
4577 4593 </enum>
4578 4594 <enum name="NV_blend_equation_advanced_coherent">
@@ -5381,6 +5397,13 @@
5381 5397 <token name="VIDEO_CAPTURE_SURFACE_ORIGIN_NV" value="0x903C" />
5382 5398 </enum>
5383 5399 <enum name="NVX_conditional_render" />
  5400 + <enum name="OcclusionQueryEventMaskAMD">
  5401 + <token name="QUERY_DEPTH_PASS_EVENT_BIT_AMD" value="0x00000001" />
  5402 + <token name="QUERY_DEPTH_FAIL_EVENT_BIT_AMD" value="0x00000002" />
  5403 + <token name="QUERY_STENCIL_FAIL_EVENT_BIT_AMD" value="0x00000004" />
  5404 + <token name="QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD" value="0x00000008" />
  5405 + <token name="QUERY_ALL_EVENT_BITS_AMD" value="0xFFFFFFFF" />
  5406 + </enum>
5384 5407 <enum name="OES_byte_coordinates" />
5385 5408 <enum name="OES_compressed_paletted_texture">
5386 5409 <token name="PALETTE4_RGB8_OES" value="0x8B90" />
@@ -15066,6 +15089,13 @@
15066 15089 <param name="exponent" type="GLint *" flow="out" count="16" />
15067 15090 <returns type="GLbitfield" />
15068 15091 </function>
  15092 + <function name="QueryObjectParameteruiAMD" category="AMD_occlusion_query_event" extension="AMD">
  15093 + <param name="target" type="GLenum" flow="in" />
  15094 + <param name="id" type="GLuint" flow="in" />
  15095 + <param name="pname" type="GLenum" flow="in" />
  15096 + <param name="param" type="OcclusionQueryEventMaskAMD" flow="in" />
  15097 + <returns type="void" />
  15098 + </function>
15069 15099 <function name="RasterPos2xOES" category="OES_fixed_point" extension="OES">
15070 15100 <param name="x" type="GLfixed" flow="in" />
15071 15101 <param name="y" type="GLfixed" flow="in" />
@@ -25725,6 +25755,10 @@
25725 25755 <token name="MAX_GEOMETRY_IMAGE_UNIFORMS" value="0x90CD" />
25726 25756 <token name="MAX_FRAGMENT_IMAGE_UNIFORMS" value="0x90CE" />
25727 25757 <token name="MAX_COMBINED_IMAGE_UNIFORMS" value="0x90CF" />
  25758 + <token name="COMPRESSED_RGBA_BPTC_UNORM" value="0x8E8C" />
  25759 + <token name="COMPRESSED_SRGB_ALPHA_BPTC_UNORM" value="0x8E8D" />
  25760 + <token name="COMPRESSED_RGB_BPTC_SIGNED_FLOAT" value="0x8E8E" />
  25761 + <token name="COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT" value="0x8E8F" />
25728 25762 <token name="TEXTURE_IMMUTABLE_FORMAT" value="0x912F" />
25729 25763 </enum>
25730 25764 <function name="BindImageTexture" category="VERSION_4_2" extension="Core" version="4.2">
@@ -27802,6 +27836,10 @@
27802 27836 <token name="GEOMETRY_DEFORMATION_SGIX" value="0x8194" />
27803 27837 <token name="TEXTURE_DEFORMATION_SGIX" value="0x8195" />
27804 27838 </enum>
  27839 + <enum name="FogCoordinatePointerType">
  27840 + <token name="FLOAT" value="0x1406" />
  27841 + <token name="DOUBLE" value="0x140A" />
  27842 + </enum>
27805 27843 <enum name="FogMode">
27806 27844 <token name="FOG_FUNC_SGIS" value="0x812A" />
27807 27845 <token name="LINEAR" value="0x2601" />
@@ -27809,6 +27847,14 @@
27809 27847 <enum name="FogParameter">
27810 27848 <token name="FOG_OFFSET_VALUE_SGIX" value="0x8199" />
27811 27849 </enum>
  27850 + <enum name="FogPointerTypeEXT">
  27851 + <token name="FLOAT" value="0x1406" />
  27852 + <token name="DOUBLE" value="0x140A" />
  27853 + </enum>
  27854 + <enum name="FogPointerTypeIBM">
  27855 + <token name="FLOAT" value="0x1406" />
  27856 + <token name="DOUBLE" value="0x140A" />
  27857 + </enum>
27812 27858 <enum name="FragmentLightModelParameterSGIX">
27813 27859 <token name="FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX" value="0x840A" />
27814 27860 <token name="FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX" value="0x8408" />
@@ -28629,6 +28675,13 @@
28629 28675 <token name="INT" value="0x1404" />
28630 28676 <token name="SHORT" value="0x1402" />
28631 28677 </enum>
  28678 + <enum name="OcclusionQueryEventMaskAMD">
  28679 + <token name="QUERY_DEPTH_PASS_EVENT_BIT_AMD" value="0x00000001" />
  28680 + <token name="QUERY_DEPTH_FAIL_EVENT_BIT_AMD" value="0x00000002" />
  28681 + <token name="QUERY_STENCIL_FAIL_EVENT_BIT_AMD" value="0x00000004" />
  28682 + <token name="QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD" value="0x00000008" />
  28683 + <token name="QUERY_ALL_EVENT_BITS_AMD" value="0xFFFFFFFF" />
  28684 + </enum>
28632 28685 <enum name="PixelCopyType">
28633 28686 <token name="COLOR" value="0x1800" />
28634 28687 <token name="COLOR_EXT" value="0x1800" />
@@ -35931,6 +35984,10 @@
35931 35984 <token name="MAX_GEOMETRY_IMAGE_UNIFORMS" value="0x90CD" />
35932 35985 <token name="MAX_FRAGMENT_IMAGE_UNIFORMS" value="0x90CE" />
35933 35986 <token name="MAX_COMBINED_IMAGE_UNIFORMS" value="0x90CF" />
  35987 + <token name="COMPRESSED_RGBA_BPTC_UNORM" value="0x8E8C" />
  35988 + <token name="COMPRESSED_SRGB_ALPHA_BPTC_UNORM" value="0x8E8D" />
  35989 + <token name="COMPRESSED_RGB_BPTC_SIGNED_FLOAT" value="0x8E8E" />
  35990 + <token name="COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT" value="0x8E8F" />
35934 35991 <token name="TEXTURE_IMMUTABLE_FORMAT" value="0x912F" />
35935 35992 </enum>
35936 35993 <function name="BindImageTexture" category="VERSION_4_2" extension="Core" version="4.2">
@@ -37219,6 +37276,10 @@
37219 37276 <token name="GEOMETRY_DEFORMATION_SGIX" value="0x8194" />
37220 37277 <token name="TEXTURE_DEFORMATION_SGIX" value="0x8195" />
37221 37278 </enum>
  37279 + <enum name="FogCoordinatePointerType">
  37280 + <token name="FLOAT" value="0x1406" />
  37281 + <token name="DOUBLE" value="0x140A" />
  37282 + </enum>
37222 37283 <enum name="FogMode">
37223 37284 <token name="EXP" value="0x0800" deprecated="3.2" />
37224 37285 <token name="EXP2" value="0x0801" deprecated="3.2" />
@@ -37234,6 +37295,14 @@
37234 37295 <token name="FOG_OFFSET_VALUE_SGIX" value="0x8199" />
37235 37296 <token name="FOG_START" value="0x0B63" deprecated="3.2" />
37236 37297 </enum>
  37298 + <enum name="FogPointerTypeEXT">
  37299 + <token name="FLOAT" value="0x1406" />
  37300 + <token name="DOUBLE" value="0x140A" />
  37301 + </enum>
  37302 + <enum name="FogPointerTypeIBM">
  37303 + <token name="FLOAT" value="0x1406" />
  37304 + <token name="DOUBLE" value="0x140A" />
  37305 + </enum>
37237 37306 <enum name="FragmentLightModelParameterSGIX">
37238 37307 <token name="FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX" value="0x840A" />
37239 37308 <token name="FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX" value="0x8408" />
@@ -38150,6 +38219,13 @@
38150 38219 <token name="FENCE_STATUS_NV" value="0x84F3" />
38151 38220 <token name="FENCE_CONDITION_NV" value="0x84F4" />
38152 38221 </enum>
  38222 + <enum name="OcclusionQueryEventMaskAMD">
  38223 + <token name="QUERY_DEPTH_PASS_EVENT_BIT_AMD" value="0x00000001" />
  38224 + <token name="QUERY_DEPTH_FAIL_EVENT_BIT_AMD" value="0x00000002" />
  38225 + <token name="QUERY_STENCIL_FAIL_EVENT_BIT_AMD" value="0x00000004" />
  38226 + <token name="QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD" value="0x00000008" />
  38227 + <token name="QUERY_ALL_EVENT_BITS_AMD" value="0xFFFFFFFF" />
  38228 + </enum>
38153 38229 <enum name="OES_blend_equation_separate">
38154 38230 <token name="BLEND_EQUATION_RGB_OES" value="0x8009" />
38155 38231 <token name="BLEND_EQUATION_ALPHA_OES" value="0x883D" />
@@ -42081,6 +42157,10 @@
42081 42157 <enum name="FJ_shader_binary_GCCSO">
42082 42158 <token name="GCCSO_SHADER_BINARY_FJ" value="0x9260" />
42083 42159 </enum>
  42160 + <enum name="FogCoordinatePointerType">
  42161 + <token name="FLOAT" value="0x1406" />
  42162 + <token name="DOUBLE" value="0x140A" />
  42163 + </enum>
42084 42164 <enum name="FogMode">
42085 42165 <token name="EXP" value="0x0800" deprecated="3.2" />
42086 42166 <token name="EXP2" value="0x0801" deprecated="3.2" />
@@ -42096,6 +42176,14 @@
42096 42176 <token name="FOG_OFFSET_VALUE_SGIX" value="0x8199" />
42097 42177 <token name="FOG_START" value="0x0B63" deprecated="3.2" />
42098 42178 </enum>
  42179 + <enum name="FogPointerTypeEXT">
  42180 + <token name="FLOAT" value="0x1406" />
  42181 + <token name="DOUBLE" value="0x140A" />
  42182 + </enum>
  42183 + <enum name="FogPointerTypeIBM">
  42184 + <token name="FLOAT" value="0x1406" />
  42185 + <token name="DOUBLE" value="0x140A" />
  42186 + </enum>
42099 42187 <enum name="FragmentLightModelParameterSGIX">
42100 42188 <token name="FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX" value="0x840A" />
42101 42189 <token name="FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX" value="0x8408" />
@@ -43142,16 +43230,9 @@
43142 43230 <token name="SHORT" value="0x1402" />
43143 43231 </enum>
43144 43232 <enum name="NV_blend_equation_advanced">
43145   - <token name="BLUE_NV" value="0x1905" />
43146   - <token name="GREEN_NV" value="0x1904" />
43147   - <token name="RED_NV" value="0x1903" />
43148   - <token name="XOR_NV" value="0x1506" />
43149   - <token name="BLUE" value="0x1905" />
43150   - <token name="GREEN" value="0x1904" />
43151   - <token name="RED" value="0x1903" />
43152   - <token name="XOR" value="0x1506" />
43153 43233 <token name="BLEND_OVERLAP_NV" value="0x9281" />
43154 43234 <token name="BLEND_PREMULTIPLIED_SRC_NV" value="0x9280" />
  43235 + <token name="BLUE_NV" value="0x1905" />
43155 43236 <token name="COLORBURN_NV" value="0x929A" />
43156 43237 <token name="COLORDODGE_NV" value="0x9299" />
43157 43238 <token name="CONJOINT_NV" value="0x9284" />
@@ -43165,6 +43246,7 @@
43165 43246 <token name="DST_OUT_NV" value="0x928D" />
43166 43247 <token name="DST_OVER_NV" value="0x9289" />
43167 43248 <token name="EXCLUSION_NV" value="0x92A0" />
  43249 + <token name="GREEN_NV" value="0x1904" />
43168 43250 <token name="HARDLIGHT_NV" value="0x929B" />
43169 43251 <token name="HARDMIX_NV" value="0x92A9" />
43170 43252 <token name="HSL_COLOR_NV" value="0x92AF" />
@@ -43187,6 +43269,7 @@
43187 43269 <token name="PLUS_CLAMPED_NV" value="0x92B1" />
43188 43270 <token name="PLUS_DARKER_NV" value="0x9292" />
43189 43271 <token name="PLUS_NV" value="0x9291" />
  43272 + <token name="RED_NV" value="0x1903" />
43190 43273 <token name="SCREEN_NV" value="0x9295" />
43191 43274 <token name="SOFTLIGHT_NV" value="0x929C" />
43192 43275 <token name="SRC_ATOP_NV" value="0x928E" />
@@ -43196,6 +43279,7 @@
43196 43279 <token name="SRC_OVER_NV" value="0x9288" />
43197 43280 <token name="UNCORRELATED_NV" value="0x9282" />
43198 43281 <token name="VIVIDLIGHT_NV" value="0x92A6" />
  43282 + <token name="XOR_NV" value="0x1506" />
43199 43283 <token name="ZERO" value="0" />
43200 43284 </enum>
43201 43285 <enum name="NV_blend_equation_advanced_coherent">
@@ -43334,6 +43418,13 @@
43334 43418 </enum>
43335 43419 <enum name="NV_texture_compression_s3tc_update" />
43336 43420 <enum name="NV_texture_npot_2D_mipmap" />
  43421 + <enum name="OcclusionQueryEventMaskAMD">
  43422 + <token name="QUERY_DEPTH_PASS_EVENT_BIT_AMD" value="0x00000001" />
  43423 + <token name="QUERY_DEPTH_FAIL_EVENT_BIT_AMD" value="0x00000002" />
  43424 + <token name="QUERY_STENCIL_FAIL_EVENT_BIT_AMD" value="0x00000004" />
  43425 + <token name="QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD" value="0x00000008" />
  43426 + <token name="QUERY_ALL_EVENT_BITS_AMD" value="0xFFFFFFFF" />
  43427 + </enum>
43337 43428 <enum name="OES_compressed_ETC1_RGB8_texture">
43338 43429 <token name="ETC1_RGB8_OES" value="0x8D64" />
43339 43430 </enum>
@@ -43458,6 +43549,26 @@
43458 43549 <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR" value="0x93DB" />
43459 43550 <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR" value="0x93DC" />
43460 43551 <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR" value="0x93DD" />
  43552 + <token name="COMPRESSED_RGBA_ASTC_3x3x3_OES" value="0x93C0" />
  43553 + <token name="COMPRESSED_RGBA_ASTC_4x3x3_OES" value="0x93C1" />
  43554 + <token name="COMPRESSED_RGBA_ASTC_4x4x3_OES" value="0x93C2" />
  43555 + <token name="COMPRESSED_RGBA_ASTC_4x4x4_OES" value="0x93C3" />
  43556 + <token name="COMPRESSED_RGBA_ASTC_5x4x4_OES" value="0x93C4" />
  43557 + <token name="COMPRESSED_RGBA_ASTC_5x5x4_OES" value="0x93C5" />
  43558 + <token name="COMPRESSED_RGBA_ASTC_5x5x5_OES" value="0x93C6" />
  43559 + <token name="COMPRESSED_RGBA_ASTC_6x5x5_OES" value="0x93C7" />
  43560 + <token name="COMPRESSED_RGBA_ASTC_6x6x5_OES" value="0x93C8" />
  43561 + <token name="COMPRESSED_RGBA_ASTC_6x6x6_OES" value="0x93C9" />
  43562 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES" value="0x93E0" />
  43563 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES" value="0x93E1" />
  43564 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES" value="0x93E2" />
  43565 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES" value="0x93E3" />
  43566 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES" value="0x93E4" />
  43567 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES" value="0x93E5" />
  43568 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES" value="0x93E6" />
  43569 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES" value="0x93E7" />
  43570 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES" value="0x93E8" />
  43571 + <token name="COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES" value="0x93E9" />
43461 43572 </enum>
43462 43573 <enum name="OES_texture_float">
43463 43574 <token name="FLOAT" value="0x1406" />
1  Source/Bind/Structures/Function.cs
@@ -36,6 +36,7 @@ public Function(Function f)
36 36 Parameters = new ParameterCollection(f.Parameters);
37 37 ReturnType = new Type(f.ReturnType);
38 38 TrimmedName = f.TrimmedName;
  39 + Obsolete = f.Obsolete;
39 40 Body.AddRange(f.Body);
40 41 }
41 42
32 Source/OpenTK/Graphics/ES11/ES11.cs
@@ -765,6 +765,7 @@ void BindBuffer(OpenTK.Graphics.ES11.All target, UInt32 buffer)
765 765 /// Specifies the name of a texture.
766 766 /// </para>
767 767 /// </param>
  768 + [Obsolete("Use strongly-typed overload instead")]
768 769 [AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glBindTexture")]
769 770 public static
770 771 void BindTexture(OpenTK.Graphics.ES11.All target, Int32 texture)
@@ -12237,6 +12238,7 @@ void ShadeModel(OpenTK.Graphics.ES11.ShadingModel mode)
12237 12238 /// Specifies a mask that is ANDed with both the reference value and the stored stencil value when the test is done. The initial value is all 1's.
12238 12239 /// </para>
12239 12240 /// </param>
  12241 + [Obsolete("Use strongly-typed overload instead")]
12240 12242 [AutoGenerated(Category = "VERSION_ES_CM_1_0", Version = "1.0", EntryPoint = "glStencilFunc")]
12241 12243 public static
12242 12244 void StencilFunc(OpenTK.Graphics.ES11.All func, Int32 @ref, Int32 mask)
@@ -15871,6 +15873,7 @@ public static partial class Ext
15871 15873 /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
15872 15874 /// </para>
15873 15875 /// </param>
  15876 + [Obsolete("Use strongly-typed overload instead")]
15874 15877 [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
15875 15878 public static
15876 15879 void BlendEquation(OpenTK.Graphics.ES11.All mode)
@@ -15879,7 +15882,34 @@ void BlendEquation(OpenTK.Graphics.ES11.All mode)
15879 15882 using (new ErrorHelper(GraphicsContext.CurrentContext))
15880 15883 {
15881 15884 #endif
15882   - Delegates.glBlendEquationEXT((OpenTK.Graphics.ES11.All)mode);
  15885 + Delegates.glBlendEquationEXT((OpenTK.Graphics.ES11.BlendEquationModeExt)mode);
  15886 + #if DEBUG
  15887 + }
  15888 + #endif
  15889 + }
  15890 +
  15891 + /// <summary>[requires: EXT_blend_minmax]
  15892 + /// Specify the equation used for both the RGB blend equation and the Alpha blend equation
  15893 + /// </summary>
  15894 + /// <param name="buf">
  15895 + /// <para>
  15896 + /// for glBlendEquationi, specifies the index of the draw buffer for which to set the blend equation.
  15897 + /// </para>
  15898 + /// </param>
  15899 + /// <param name="mode">
  15900 + /// <para>
  15901 + /// specifies how source and destination colors are combined. It must be GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX.
  15902 + /// </para>
  15903 + /// </param>
  15904 + [AutoGenerated(Category = "EXT_blend_minmax", Version = "", EntryPoint = "glBlendEquationEXT")]
  15905 + public static
  15906 + void BlendEquation(OpenTK.Graphics.ES11.BlendEquationModeExt mode)
  15907 + {
  15908 + #if DEBUG
  15909 + using (new ErrorHelper(GraphicsContext.CurrentContext))
  15910 + {
  15911 + #endif
  15912 + Delegates.glBlendEquationEXT((OpenTK.Graphics.ES11.BlendEquationModeExt)mode);
15883 15913 #if DEBUG
15884 15914 }
15885 15915 #endif
2  Source/OpenTK/Graphics/ES11/ES11Core.cs
@@ -77,7 +77,7 @@ internal static partial class Core
77 77 internal extern static void BlendColorxOES(int red, int green, int blue, int alpha);
78 78 [System.Security.SuppressUnmanagedCodeSecurity()]
79 79 [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationEXT", ExactSpelling = true)]
80   - internal extern static void BlendEquationEXT(OpenTK.Graphics.ES11.All mode);
  80 + internal extern static void BlendEquationEXT(OpenTK.Graphics.ES11.BlendEquationModeExt mode);
81 81 [System.Security.SuppressUnmanagedCodeSecurity()]
82 82 [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glBlendEquationOES", ExactSpelling = true)]
83 83 internal extern static void BlendEquationOES(OpenTK.Graphics.ES11.All mode);
2  Source/OpenTK/Graphics/ES11/ES11Delegates.cs
@@ -75,7 +75,7 @@ internal static partial class Delegates
75 75 internal delegate void BlendColorxOES(int red, int green, int blue, int alpha);
76 76 internal static BlendColorxOES glBlendColorxOES;
77 77 [System.Security.SuppressUnmanagedCodeSecurity()]
78   - internal delegate void BlendEquationEXT(OpenTK.Graphics.ES11.All mode);
  78 + internal delegate void BlendEquationEXT(OpenTK.Graphics.ES11.BlendEquationModeExt mode);
79 79 internal static BlendEquationEXT glBlendEquationEXT;
80 80 [System.Security.SuppressUnmanagedCodeSecurity()]
81 81 internal delegate void BlendEquationOES(OpenTK.Graphics.ES11.All mode);
95 Source/OpenTK/Graphics/ES11/ES11Enums.cs
@@ -110,6 +110,10 @@ public enum All : int
110 110 /// </summary>
111 111 CurrentBit = ((int)0x00000001) ,
112 112 /// <summary>
  113 + /// Original was GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001
  114 + /// </summary>
  115 + QueryDepthPassEventBitAmd = ((int)0x00000001) ,
  116 + /// <summary>
113 117 /// Original was GL_SYNC_FLUSH_COMMANDS_BIT_APPLE = 0x00000001
114 118 /// </summary>
115 119 SyncFlushCommandsBitApple = ((int)0x00000001) ,
@@ -170,6 +174,10 @@ public enum All : int
170 174 /// </summary>
171 175 PointBit = ((int)0x00000002) ,
172 176 /// <summary>
  177 + /// Original was GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002
  178 + /// </summary>
  179 + QueryDepthFailEventBitAmd = ((int)0x00000002) ,
  180 + /// <summary>
173 181 /// Original was GL_COLOR_BUFFER_BIT2_QCOM = 0x00000004
174 182 /// </summary>
175 183 ColorBufferBit2Qcom = ((int)0x00000004) ,
@@ -186,6 +194,10 @@ public enum All : int
186 194 /// </summary>
187 195 LineBit = ((int)0x00000004) ,
188 196 /// <summary>
  197 + /// Original was GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004
  198 + /// </summary>
  199 + QueryStencilFailEventBitAmd = ((int)0x00000004) ,
  200 + /// <summary>
189 201 /// Original was GL_UNIFORM_BARRIER_BIT = 0x00000004
190 202 /// </summary>
191 203 UniformBarrierBit = ((int)0x00000004) ,
@@ -202,6 +214,10 @@ public enum All : int
202 214 /// </summary>
203 215 PolygonBit = ((int)0x00000008) ,
204 216 /// <summary>
  217 + /// Original was GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008
  218 + /// </summary>
  219 + QueryDepthBoundsFailEventBitAmd = ((int)0x00000008) ,
  220 + /// <summary>
205 221 /// Original was GL_TESS_CONTROL_SHADER_BIT = 0x00000008
206 222 /// </summary>
207 223 TessControlShaderBit = ((int)0x00000008) ,
@@ -5834,6 +5850,10 @@ public enum All : int
5834 5850 /// </summary>
5835 5851 ClientAllAttribBits = unchecked((int)0xFFFFFFFF) ,
5836 5852 /// <summary>
  5853 + /// Original was GL_QUERY_ALL_EVENT_BITS_AMD = 0xFFFFFFFF
  5854 + /// </summary>
  5855 + QueryAllEventBitsAmd = unchecked((int)0xFFFFFFFF) ,
  5856 + /// <summary>
5837 5857 /// Original was GL_TIMEOUT_IGNORED_APPLE = 0xFFFFFFFFFFFFFFFF
5838 5858 /// </summary>
5839 5859 TimeoutIgnoredApple = unchecked((int)0xFFFFFFFFFFFFFFFF) ,
@@ -6455,7 +6475,7 @@ public enum BeginMode : int
6455 6475 }
6456 6476
6457 6477 /// <summary>
6458   - /// Not used directly.
  6478 + /// Used in GL.Ext.BlendEquation
6459 6479 /// </summary>
6460 6480 public enum BlendEquationModeExt : int
6461 6481 {
@@ -8159,6 +8179,21 @@ public enum FfdTargetSgix : int
8159 8179 /// <summary>
8160 8180 /// Not used directly.
8161 8181 /// </summary>
  8182 + public enum FogCoordinatePointerType : int
  8183 + {
  8184 + /// <summary>
  8185 + /// Original was GL_FLOAT = 0x1406
  8186 + /// </summary>
  8187 + Float = ((int)0x1406) ,
  8188 + /// <summary>
  8189 + /// Original was GL_DOUBLE = 0x140A
  8190 + /// </summary>
  8191 + Double = ((int)0x140A) ,
  8192 + }
  8193 +
  8194 + /// <summary>
  8195 + /// Not used directly.
  8196 + /// </summary>
8162 8197 public enum FogMode : int
8163 8198 {
8164 8199 /// <summary>
@@ -8217,6 +8252,36 @@ public enum FogParameter : int
8217 8252 /// <summary>
8218 8253 /// Not used directly.
8219 8254 /// </summary>
  8255 + public enum FogPointerTypeExt : int
  8256 + {
  8257 + /// <summary>
  8258 + /// Original was GL_FLOAT = 0x1406
  8259 + /// </summary>
  8260 + Float = ((int)0x1406) ,
  8261 + /// <summary>
  8262 + /// Original was GL_DOUBLE = 0x140A
  8263 + /// </summary>
  8264 + Double = ((int)0x140A) ,
  8265 + }
  8266 +
  8267 + /// <summary>
  8268 + /// Not used directly.
  8269 + /// </summary>
  8270 + public enum FogPointerTypeIbm : int
  8271 + {
  8272 + /// <summary>
  8273 + /// Original was GL_FLOAT = 0x1406
  8274 + /// </summary>
  8275 + Float = ((int)0x1406) ,
  8276 + /// <summary>
  8277 + /// Original was GL_DOUBLE = 0x140A
  8278 + /// </summary>
  8279 + Double = ((int)0x140A) ,
  8280 + }
  8281 +
  8282 + /// <summary>
  8283 + /// Not used directly.
  8284 + /// </summary>
8220 8285 public enum FragmentLightModelParameterSgix : int
8221 8286 {
8222 8287 /// <summary>
@@ -11990,6 +12055,34 @@ public enum NvFence : int
11990 12055 /// <summary>
11991 12056 /// Not used directly.
11992 12057 /// </summary>
  12058 + [Flags]
  12059 + public enum OcclusionQueryEventMaskAmd : int
  12060 + {
  12061 + /// <summary>
  12062 + /// Original was GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD = 0x00000001
  12063 + /// </summary>
  12064 + QueryDepthPassEventBitAmd = ((int)0x00000001) ,
  12065 + /// <summary>
  12066 + /// Original was GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD = 0x00000002
  12067 + /// </summary>
  12068 + QueryDepthFailEventBitAmd = ((int)0x00000002) ,
  12069 + /// <summary>
  12070 + /// Original was GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD = 0x00000004
  12071 + /// </summary>
  12072 + QueryStencilFailEventBitAmd = ((int)0x00000004) ,
  12073 + /// <summary>
  12074 + /// Original was GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD = 0x00000008
  12075 + /// </summary>
  12076 + QueryDepthBoundsFailEventBitAmd = ((int)0x00000008) ,
  12077 + /// <summary>
  12078 + /// Original was GL_QUERY_ALL_EVENT_BITS_AMD = 0xFFFFFFFF
  12079 + /// </summary>
  12080 + QueryAllEventBitsAmd = unchecked((int)0xFFFFFFFF) ,
  12081 + }
  12082 +
  12083 + /// <summary>
  12084 + /// Not used directly.
  12085 + /// </summary>
11993 12086 public enum OesblendEquationSeparate : int
11994 12087 {
11995 12088 /// <summary>
86 Source/OpenTK/Graphics/ES20/ES20.cs
@@ -2233,6 +2233,7 @@ public static partial class Apple
2233 2233 /// The timeout, specified in nanoseconds, for which the implementation should wait for sync to become signaled.
2234 2234 /// </para>
2235 2235 /// </param>
  2236 + [Obsolete("Use strongly-typed overload instead")]
2236 2237 [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glClientWaitSyncAPPLE")]
2237 2238 public static
2238 2239 OpenTK.Graphics.ES20.WaitSyncStatus ClientWaitSync(IntPtr sync, OpenTK.Graphics.ES20.All flags, Int64 timeout)
@@ -3047,6 +3048,7 @@ void ResolveMultisampleFramebuffer()
3047 3048 /// Specifies the timeout that the server should wait before continuing. timeout must be GL_TIMEOUT_IGNORED.
3048 3049 /// </para>
3049 3050 /// </param>
  3051 + [Obsolete("Use strongly-typed overload instead")]
3050 3052 [AutoGenerated(Category = "APPLE_sync", Version = "", EntryPoint = "glWaitSyncAPPLE")]
3051 3053 public static
3052 3054 void WaitSync(IntPtr sync, OpenTK.Graphics.ES20.All flags, Int64 timeout)
@@ -3340,6 +3342,7 @@ void BindAttribLocation(UInt32 program, UInt32 index, String name)
3340 3342 /// Specifies the name of a buffer object.
3341 3343 /// </para>
3342 3344 /// </param>
  3345 + [Obsolete("Use strongly-typed overload instead")]
3343 3346 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBindBuffer")]
3344 3347 public static
3345 3348 void BindBuffer(OpenTK.Graphics.ES20.All target, Int32 buffer)
@@ -3451,6 +3454,7 @@ void BindBuffer(OpenTK.Graphics.ES20.BufferTarget target, UInt32 buffer)
3451 3454 /// Specifies the name of the framebuffer object to bind.
3452 3455 /// </para>
3453 3456 /// </param>
  3457 + [Obsolete("Use strongly-typed overload instead")]
3454 3458 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBindFramebuffer")]
3455 3459 public static
3456 3460 void BindFramebuffer(OpenTK.Graphics.ES20.All target, Int32 framebuffer)
@@ -3562,6 +3566,7 @@ void BindFramebuffer(OpenTK.Graphics.ES20.FramebufferTarget target, UInt32 frame
3562 3566 /// Specifies the name of the renderbuffer object to bind.
3563 3567 /// </para>
3564 3568 /// </param>
  3569 + [Obsolete("Use strongly-typed overload instead")]
3565 3570 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBindRenderbuffer")]
3566 3571 public static
3567 3572 void BindRenderbuffer(OpenTK.Graphics.ES20.All target, Int32 renderbuffer)
@@ -3673,6 +3678,7 @@ void BindRenderbuffer(OpenTK.Graphics.ES20.RenderbufferTarget target, UInt32 ren
3673 3678 /// Specifies the name of a texture.
3674 3679 /// </para>
3675 3680 /// </param>
  3681 + [Obsolete("Use strongly-typed overload instead")]
3676 3682 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glBindTexture")]
3677 3683 public static
3678 3684 void BindTexture(OpenTK.Graphics.ES20.All target, Int32 texture)
@@ -8071,6 +8077,7 @@ void DebugMessageCallback<T1>(DebugProc callback, [InAttribute, OutAttribute] re
8071 8077 /// A Boolean flag determining whether the selected messages should be enabled or disabled.
8072 8078 /// </para>
8073 8079 /// </param>
  8080 + [Obsolete("Use strongly-typed overload instead")]
8074 8081 [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
8075 8082 public static
8076 8083 void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, Int32[] ids, bool enabled)
@@ -8124,6 +8131,7 @@ void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.A
8124 8131 /// A Boolean flag determining whether the selected messages should be enabled or disabled.
8125 8132 /// </para>
8126 8133 /// </param>
  8134 + [Obsolete("Use strongly-typed overload instead")]
8127 8135 [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
8128 8136 public static
8129 8137 void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, OpenTK.Graphics.ES20.All severity, Int32 count, ref Int32 ids, bool enabled)
@@ -8177,6 +8185,7 @@ void DebugMessageControl(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.A
8177 8185 /// A Boolean flag determining whether the selected messages should be enabled or disabled.
8178 8186 /// </para>
8179 8187 /// </param>
  8188 + [Obsolete("Use strongly-typed overload instead")]
8180 8189 [System.CLSCompliant(false)]
8181 8190 [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageControl")]
8182 8191 public static
@@ -8694,6 +8703,7 @@ unsafe void DebugMessageControl(OpenTK.Graphics.ES20.DebugSourceControl source,
8694 8703 /// The address of a character array containing the message to insert.
8695 8704 /// </para>
8696 8705 /// </param>
  8706 + [Obsolete("Use strongly-typed overload instead")]
8697 8707 [AutoGenerated(Category = "KHR_debug", Version = "", EntryPoint = "glDebugMessageInsert")]
8698 8708 public static
8699 8709 void DebugMessageInsert(OpenTK.Graphics.ES20.All source, OpenTK.Graphics.ES20.All type, Int32 id, OpenTK.Graphics.ES20.All severity, Int32 length, String buf)
@@ -11104,6 +11114,7 @@ void Flush()
11104 11114 /// Specifies the name of an existing renderbuffer object of type renderbuffertarget to attach.
11105 11115 /// </para>
11106 11116 /// </param>
  11117 + [Obsolete("Use strongly-typed overload instead")]
11107 11118 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glFramebufferRenderbuffer")]
11108 11119 public static
11109 11120 void FramebufferRenderbuffer(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.All renderbuffertarget, Int32 renderbuffer)
@@ -11310,6 +11321,7 @@ void FramebufferRenderbuffer(OpenTK.Graphics.ES20.FramebufferTarget target, Open
11310 11321 }
11311 11322
11312 11323 /// <summary>[requires: v2.0 and ES_VERSION_2_0]</summary>
  11324 + [Obsolete("Use strongly-typed overload instead")]
11313 11325 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glFramebufferTexture2D")]
11314 11326 public static
11315 11327 void FramebufferTexture2D(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All attachment, OpenTK.Graphics.ES20.All textarget, Int32 texture, Int32 level)
@@ -12533,6 +12545,7 @@ void GetActiveAttrib(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] o
12533 12545 /// Returns a null terminated string containing the name of the attribute variable.
12534 12546 /// </para>
12535 12547 /// </param>
  12548 + [Obsolete("Use strongly-typed overload instead")]
12536 12549 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
12537 12550 public static
12538 12551 void GetActiveAttrib(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES20.All type, [OutAttribute] StringBuilder name)
@@ -12649,6 +12662,7 @@ unsafe void GetActiveAttrib(Int32 program, Int32 index, Int32 bufSize, [OutAttri
12649 12662 /// Returns a null terminated string containing the name of the attribute variable.
12650 12663 /// </para>
12651 12664 /// </param>
  12665 + [Obsolete("Use strongly-typed overload instead")]
12652 12666 [System.CLSCompliant(false)]
12653 12667 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
12654 12668 public static
@@ -13001,6 +13015,7 @@ void GetActiveUniform(Int32 program, Int32 index, Int32 bufSize, [OutAttribute]
13001 13015 /// Returns a null terminated string containing the name of the uniform variable.
13002 13016 /// </para>
13003 13017 /// </param>
  13018 + [Obsolete("Use strongly-typed overload instead")]
13004 13019 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetActiveUniform")]
13005 13020 public static
13006 13021 void GetActiveUniform(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.ES20.All type, [OutAttribute] StringBuilder name)
@@ -13117,6 +13132,7 @@ unsafe void GetActiveUniform(Int32 program, Int32 index, Int32 bufSize, [OutAttr
13117 13132 /// Returns a null terminated string containing the name of the uniform variable.
13118 13133 /// </para>
13119 13134 /// </param>
  13135 + [Obsolete("Use strongly-typed overload instead")]
13120 13136 [System.CLSCompliant(false)]
13121 13137 [AutoGenerated(Category = "ES_VERSION_2_0", Version = "2.0", EntryPoint = "glGetActiveUniform")]