Updated the specs using the latest generator. Removes extra spaces. Simplifies overloads GL/Glu functions. Slight speedup to functions that return values (no temporary variables).

Source/OpenTK/OpenGL/Bindings/GLCore.cs

@@ -1451,7 +1451,7 @@ namespace OpenTK.OpenGL
             internal extern static void GetBufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, IntPtr size, [Out] IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glMapBuffer", ExactSpelling = true)]
-            internal extern static IntPtr MapBuffer(GL.Enums.VERSION_1_5 target, GL.Enums.VERSION_1_5 access);
+            internal extern static unsafe IntPtr MapBuffer(GL.Enums.VERSION_1_5 target, GL.Enums.VERSION_1_5 access);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(GL.Library, EntryPoint = "glUnmapBuffer", ExactSpelling = true)]
             internal extern static Boolean UnmapBuffer(GL.Enums.VERSION_1_5 target);

Source/OpenTK/OpenGL/Bindings/GLDelegates.cs

@@ -1449,8 +1449,8 @@ namespace OpenTK.OpenGL
             internal delegate void GetBufferSubData(GL.Enums.VERSION_1_5 target, IntPtr offset, IntPtr size, [Out] IntPtr data);
             internal static GetBufferSubData glGetBufferSubData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr MapBuffer(GL.Enums.VERSION_1_5 target, GL.Enums.VERSION_1_5 access);
+            internal unsafe delegate IntPtr MapBuffer(GL.Enums.VERSION_1_5 target, GL.Enums.VERSION_1_5 access);
-            internal static MapBuffer glMapBuffer;
+            internal unsafe static MapBuffer glMapBuffer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate Boolean UnmapBuffer(GL.Enums.VERSION_1_5 target);
             internal static UnmapBuffer glUnmapBuffer;
@@ -2202,8 +2202,8 @@ namespace OpenTK.OpenGL
             internal delegate void GetBufferSubDataARB(GL.Enums.ARB_vertex_buffer_object target, IntPtr offset, IntPtr size, [Out] IntPtr data);
             internal static GetBufferSubDataARB glGetBufferSubDataARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr MapBufferARB(GL.Enums.ARB_vertex_buffer_object target, GL.Enums.ARB_vertex_buffer_object access);
+            internal unsafe delegate IntPtr MapBufferARB(GL.Enums.ARB_vertex_buffer_object target, GL.Enums.ARB_vertex_buffer_object access);
-            internal static MapBufferARB glMapBufferARB;
+            internal unsafe static MapBufferARB glMapBufferARB;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate Boolean UnmapBufferARB(GL.Enums.ARB_vertex_buffer_object target);
             internal static UnmapBufferARB glUnmapBufferARB;
@@ -4212,8 +4212,8 @@ namespace OpenTK.OpenGL
             internal delegate void PrimitiveRestartIndexNV(UInt32 index);
             internal static PrimitiveRestartIndexNV glPrimitiveRestartIndexNV;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal delegate IntPtr MapObjectBufferATI(UInt32 buffer);
+            internal unsafe delegate IntPtr MapObjectBufferATI(UInt32 buffer);
-            internal static MapObjectBufferATI glMapObjectBufferATI;
+            internal unsafe static MapObjectBufferATI glMapObjectBufferATI;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void UnmapObjectBufferATI(UInt32 buffer);
             internal static UnmapObjectBufferATI glUnmapObjectBufferATI;

Source/OpenTK/OpenGL/Bindings/GluCore.cs

@@ -6,9 +6,8 @@ namespace OpenTK.OpenGL
     partial class Glu
     {
 
-        internal static class Imports
+        internal static partial class Imports
         {
-            static Imports() { }
 
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBeginCurve", ExactSpelling = true)]
@@ -24,22 +23,22 @@ namespace OpenTK.OpenGL
             internal extern static void BeginTrim(int nurb);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild1DMipmapLevels", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build1DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal extern static Int32 Build1DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild1DMipmaps", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build1DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal extern static Int32 Build1DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild2DMipmapLevels", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build2DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal extern static Int32 Build2DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild2DMipmaps", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build2DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal extern static Int32 Build2DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild3DMipmapLevels", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build3DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal extern static Int32 Build3DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluBuild3DMipmaps", ExactSpelling = true)]
-            internal extern static unsafe Int32 Build3DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal extern static Int32 Build3DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluCheckExtension", ExactSpelling = true)]
             internal extern static unsafe Boolean CheckExtension(Byte* extName, Byte* extString);
@@ -105,7 +104,7 @@ namespace OpenTK.OpenGL
             internal extern static void NurbsCallback(int nurb, Glu.Enums.NurbsCallback which, IntPtr CallBackFunc);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsCallbackData", ExactSpelling = true)]
-            internal extern static unsafe void NurbsCallbackData(int nurb, void* userData);
+            internal extern static void NurbsCallbackData(int nurb, IntPtr userData);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluNurbsCurve", ExactSpelling = true)]
             internal extern static unsafe void NurbsCurve(int nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, GL.Enums.MapTarget type);
@@ -150,7 +149,7 @@ namespace OpenTK.OpenGL
             internal extern static void QuadricTexture(int quad, Glu.Enums.Boolean texture);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluScaleImage", ExactSpelling = true)]
-            internal extern static unsafe Int32 ScaleImage(GL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, GL.Enums.PixelType typeIn, void* dataIn, Int32 wOut, Int32 hOut, GL.Enums.PixelType typeOut, [Out] void* dataOut);
+            internal extern static Int32 ScaleImage(GL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, GL.Enums.PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, GL.Enums.PixelType typeOut, [Out] IntPtr dataOut);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluSphere", ExactSpelling = true)]
             internal extern static void Sphere(int quad, double radius, Int32 slices, Int32 stacks);
@@ -159,7 +158,7 @@ namespace OpenTK.OpenGL
             internal extern static void TessBeginContour(int tess);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessBeginPolygon", ExactSpelling = true)]
-            internal extern static unsafe void TessBeginPolygon(int tess, void* data);
+            internal extern static void TessBeginPolygon(int tess, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessCallback", ExactSpelling = true)]
             internal extern static void TessCallback(int tess, Glu.Enums.TessCallback which, IntPtr CallBackFunc);
@@ -177,7 +176,7 @@ namespace OpenTK.OpenGL
             internal extern static void TessProperty(int tess, Glu.Enums.TessProperty which, double data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluTessVertex", ExactSpelling = true)]
-            internal extern static unsafe void TessVertex(int tess, [Out] double* location, void* data);
+            internal extern static unsafe void TessVertex(int tess, [Out] double* location, IntPtr data);
             [System.Security.SuppressUnmanagedCodeSecurity()]
             [System.Runtime.InteropServices.DllImport(Glu.Library, EntryPoint = "gluUnProject", ExactSpelling = true)]
             internal extern static unsafe Int32 UnProject(double winX, double winY, double winZ, double* model, double* proj, Int32* view, double* objX, double* objY, double* objZ);

Source/OpenTK/OpenGL/Bindings/GluDelegates.cs

@@ -2,196 +2,193 @@ namespace OpenTK.OpenGL
 {
     using System;
     using System.Runtime.InteropServices;
+    #pragma warning disable 0649
 
     partial class Glu
     {
-
+        internal static partial class Delegates
-        internal static class Delegates
         {
-            static Delegates()
-            {
-            }
-
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BeginCurve(int nurb);
-            internal static BeginCurve gluBeginCurve = null;
+            internal static BeginCurve gluBeginCurve;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BeginPolygon(int tess);
-            internal static BeginPolygon gluBeginPolygon = null;
+            internal static BeginPolygon gluBeginPolygon;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BeginSurface(int nurb);
-            internal static BeginSurface gluBeginSurface = null;
+            internal static BeginSurface gluBeginSurface;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void BeginTrim(int nurb);
-            internal static BeginTrim gluBeginTrim = null;
+            internal static BeginTrim gluBeginTrim;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build1DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal delegate Int32 Build1DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
-            internal unsafe static Build1DMipmapLevels gluBuild1DMipmapLevels = null;
+            internal static Build1DMipmapLevels gluBuild1DMipmapLevels;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build1DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal delegate Int32 Build1DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
-            internal unsafe static Build1DMipmaps gluBuild1DMipmaps = null;
+            internal static Build1DMipmaps gluBuild1DMipmaps;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build2DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal delegate Int32 Build2DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
-            internal unsafe static Build2DMipmapLevels gluBuild2DMipmapLevels = null;
+            internal static Build2DMipmapLevels gluBuild2DMipmapLevels;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build2DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal delegate Int32 Build2DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
-            internal unsafe static Build2DMipmaps gluBuild2DMipmaps = null;
+            internal static Build2DMipmaps gluBuild2DMipmaps;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build3DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, void* data);
+            internal delegate Int32 Build3DMipmapLevels(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, Int32 level, Int32 @base, Int32 max, IntPtr data);
-            internal unsafe static Build3DMipmapLevels gluBuild3DMipmapLevels = null;
+            internal static Build3DMipmapLevels gluBuild3DMipmapLevels;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 Build3DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, void* data);
+            internal delegate Int32 Build3DMipmaps(GL.Enums.TextureTarget target, Int32 internalFormat, Int32 width, Int32 height, Int32 depth, GL.Enums.PixelFormat format, GL.Enums.PixelType type, IntPtr data);
-            internal unsafe static Build3DMipmaps gluBuild3DMipmaps = null;
+            internal static Build3DMipmaps gluBuild3DMipmaps;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Boolean CheckExtension(Byte* extName, Byte* extString);
-            internal unsafe static CheckExtension gluCheckExtension = null;
+            internal unsafe static CheckExtension gluCheckExtension;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Cylinder(int quad, double @base, double top, double height, Int32 slices, Int32 stacks);
-            internal static Cylinder gluCylinder = null;
+            internal static Cylinder gluCylinder;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DeleteNurbsRenderer(int nurb);
-            internal static DeleteNurbsRenderer gluDeleteNurbsRenderer = null;
+            internal static DeleteNurbsRenderer gluDeleteNurbsRenderer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DeleteQuadric(int quad);
-            internal static DeleteQuadric gluDeleteQuadric = null;
+            internal static DeleteQuadric gluDeleteQuadric;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void DeleteTess(int tess);
-            internal static DeleteTess gluDeleteTess = null;
+            internal static DeleteTess gluDeleteTess;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Disk(int quad, double inner, double outer, Int32 slices, Int32 loops);
-            internal static Disk gluDisk = null;
+            internal static Disk gluDisk;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndCurve(int nurb);
-            internal static EndCurve gluEndCurve = null;
+            internal static EndCurve gluEndCurve;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndPolygon(int tess);
-            internal static EndPolygon gluEndPolygon = null;
+            internal static EndPolygon gluEndPolygon;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndSurface(int nurb);
-            internal static EndSurface gluEndSurface = null;
+            internal static EndSurface gluEndSurface;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void EndTrim(int nurb);
-            internal static EndTrim gluEndTrim = null;
+            internal static EndTrim gluEndTrim;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate IntPtr ErrorString(Glu.Enums.ErrorCode error);
-            internal static ErrorString gluErrorString = null;
+            internal static ErrorString gluErrorString;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate IntPtr GetString(Glu.Enums.StringName name);
-            internal static GetString gluGetString = null;
+            internal static GetString gluGetString;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetNurbsProperty(int nurb, Glu.Enums.NurbsProperty property, [Out] float* data);
-            internal unsafe static GetNurbsProperty gluGetNurbsProperty = null;
+            internal unsafe static GetNurbsProperty gluGetNurbsProperty;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void GetTessProperty(int tess, Glu.Enums.TessProperty which, [Out] double* data);
-            internal unsafe static GetTessProperty gluGetTessProperty = null;
+            internal unsafe static GetTessProperty gluGetTessProperty;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void LoadSamplingMatrices(int nurb, float* model, float* perspective, Int32* view);
-            internal unsafe static LoadSamplingMatrices gluLoadSamplingMatrices = null;
+            internal unsafe static LoadSamplingMatrices gluLoadSamplingMatrices;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void LookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ);
-            internal static LookAt gluLookAt = null;
+            internal static LookAt gluLookAt;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate int NewNurbsRenderer();
-            internal static NewNurbsRenderer gluNewNurbsRenderer = null;
+            internal static NewNurbsRenderer gluNewNurbsRenderer;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate int NewQuadric();
-            internal static NewQuadric gluNewQuadric = null;
+            internal static NewQuadric gluNewQuadric;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate int NewTess();
-            internal static NewTess gluNewTess = null;
+            internal static NewTess gluNewTess;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void NextContour(int tess, Glu.Enums.TessContour type);
-            internal static NextContour gluNextContour = null;
+            internal static NextContour gluNextContour;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void NurbsCallback(int nurb, Glu.Enums.NurbsCallback which, IntPtr CallBackFunc);
-            internal static NurbsCallback gluNurbsCallback = null;
+            internal static NurbsCallback gluNurbsCallback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void NurbsCallbackData(int nurb, void* userData);
+            internal delegate void NurbsCallbackData(int nurb, IntPtr userData);
-            internal unsafe static NurbsCallbackData gluNurbsCallbackData = null;
+            internal static NurbsCallbackData gluNurbsCallbackData;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void NurbsCallbackDataEXT(int nurb, void* userData);
+            internal delegate void NurbsCallbackDataEXT(int nurb, IntPtr userData);
-            internal unsafe static NurbsCallbackDataEXT gluNurbsCallbackDataEXT = null;
+            internal static NurbsCallbackDataEXT gluNurbsCallbackDataEXT;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void NurbsCurve(int nurb, Int32 knotCount, [Out] float* knots, Int32 stride, [Out] float* control, Int32 order, GL.Enums.MapTarget type);
-            internal unsafe static NurbsCurve gluNurbsCurve = null;
+            internal unsafe static NurbsCurve gluNurbsCurve;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void NurbsProperty(int nurb, Glu.Enums.NurbsProperty property, float value);
-            internal static NurbsProperty gluNurbsProperty = null;
+            internal static NurbsProperty gluNurbsProperty;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void NurbsSurface(int nurb, Int32 sKnotCount, float* sKnots, Int32 tKnotCount, float* tKnots, Int32 sStride, Int32 tStride, float* control, Int32 sOrder, Int32 tOrder, GL.Enums.MapTarget type);
-            internal unsafe static NurbsSurface gluNurbsSurface = null;
+            internal unsafe static NurbsSurface gluNurbsSurface;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Ortho2D(double left, double right, double bottom, double top);
-            internal static Ortho2D gluOrtho2D = null;
+            internal static Ortho2D gluOrtho2D;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void PartialDisk(int quad, double inner, double outer, Int32 slices, Int32 loops, double start, double sweep);
-            internal static PartialDisk gluPartialDisk = null;
+            internal static PartialDisk gluPartialDisk;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Perspective(double fovy, double aspect, double zNear, double zFar);
-            internal static Perspective gluPerspective = null;
+            internal static Perspective gluPerspective;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void PickMatrix(double x, double y, double delX, double delY, [Out] Int32* viewport);
-            internal unsafe static PickMatrix gluPickMatrix = null;
+            internal unsafe static PickMatrix gluPickMatrix;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 Project(double objX, double objY, double objZ, double* model, double* proj, Int32* view, double* winX, double* winY, double* winZ);
-            internal unsafe static Project gluProject = null;
+            internal unsafe static Project gluProject;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate void PwlCurve(int nurb, Int32 count, float* data, Int32 stride, Glu.Enums.NurbsTrim type);
-            internal unsafe static PwlCurve gluPwlCurve = null;
+            internal unsafe static PwlCurve gluPwlCurve;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void QuadricCallback(int quad, Glu.Enums.QuadricCallback which, IntPtr CallBackFunc);
-            internal static QuadricCallback gluQuadricCallback = null;
+            internal static QuadricCallback gluQuadricCallback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void QuadricDrawStyle(int quad, Glu.Enums.QuadricDrawStyle draw);
-            internal static QuadricDrawStyle gluQuadricDrawStyle = null;
+            internal static QuadricDrawStyle gluQuadricDrawStyle;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void QuadricNormals(int quad, Glu.Enums.QuadricNormal normal);
-            internal static QuadricNormals gluQuadricNormals = null;
+            internal static QuadricNormals gluQuadricNormals;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void QuadricOrientation(int quad, Glu.Enums.QuadricOrientation orientation);
-            internal static QuadricOrientation gluQuadricOrientation = null;
+            internal static QuadricOrientation gluQuadricOrientation;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void QuadricTexture(int quad, Glu.Enums.Boolean texture);
-            internal static QuadricTexture gluQuadricTexture = null;
+            internal static QuadricTexture gluQuadricTexture;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate Int32 ScaleImage(GL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, GL.Enums.PixelType typeIn, void* dataIn, Int32 wOut, Int32 hOut, GL.Enums.PixelType typeOut, [Out] void* dataOut);
+            internal delegate Int32 ScaleImage(GL.Enums.PixelFormat format, Int32 wIn, Int32 hIn, GL.Enums.PixelType typeIn, IntPtr dataIn, Int32 wOut, Int32 hOut, GL.Enums.PixelType typeOut, [Out] IntPtr dataOut);
-            internal unsafe static ScaleImage gluScaleImage = null;
+            internal static ScaleImage gluScaleImage;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void Sphere(int quad, double radius, Int32 slices, Int32 stacks);
-            internal static Sphere gluSphere = null;
+            internal static Sphere gluSphere;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessBeginContour(int tess);
-            internal static TessBeginContour gluTessBeginContour = null;
+            internal static TessBeginContour gluTessBeginContour;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TessBeginPolygon(int tess, void* data);
+            internal delegate void TessBeginPolygon(int tess, IntPtr data);
-            internal unsafe static TessBeginPolygon gluTessBeginPolygon = null;
+            internal static TessBeginPolygon gluTessBeginPolygon;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessCallback(int tess, Glu.Enums.TessCallback which, IntPtr CallBackFunc);
-            internal static TessCallback gluTessCallback = null;
+            internal static TessCallback gluTessCallback;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessEndContour(int tess);
-            internal static TessEndContour gluTessEndContour = null;
+            internal static TessEndContour gluTessEndContour;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessEndPolygon(int tess);
-            internal static TessEndPolygon gluTessEndPolygon = null;
+            internal static TessEndPolygon gluTessEndPolygon;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessNormal(int tess, double valueX, double valueY, double valueZ);
-            internal static TessNormal gluTessNormal = null;
+            internal static TessNormal gluTessNormal;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal delegate void TessProperty(int tess, Glu.Enums.TessProperty which, double data);
-            internal static TessProperty gluTessProperty = null;
+            internal static TessProperty gluTessProperty;
             [System.Security.SuppressUnmanagedCodeSecurity()]
-            internal unsafe delegate void TessVertex(int tess, [Out] double* location, void* data);
+            internal unsafe delegate void TessVertex(int tess, [Out] double* location, IntPtr data);
-            internal unsafe static TessVertex gluTessVertex = null;
+            internal unsafe static TessVertex gluTessVertex;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 TexFilterFuncSGI(GL.Enums.TextureTarget target, Glu.Enums.Filter4TypeSGIS filtertype, float* parms, Int32 n, [Out] float* weights);
-            internal unsafe static TexFilterFuncSGI gluTexFilterFuncSGI = null;
+            internal unsafe static TexFilterFuncSGI gluTexFilterFuncSGI;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 UnProject(double winX, double winY, double winZ, double* model, double* proj, Int32* view, double* objX, double* objY, double* objZ);
-            internal unsafe static UnProject gluUnProject = null;
+            internal unsafe static UnProject gluUnProject;
             [System.Security.SuppressUnmanagedCodeSecurity()]
             internal unsafe delegate Int32 UnProject4(double winX, double winY, double winZ, double clipW, double* model, double* proj, Int32* view, double near, double far, double* objX, double* objY, double* objZ, double* objW);
-            internal unsafe static UnProject4 gluUnProject4 = null;
+            internal unsafe static UnProject4 gluUnProject4;
         }
     }
+    #pragma warning restore 0649
 }

Source/OpenTK/OpenGL/Bindings/GluEnums.cs

@@ -9,20 +9,20 @@ namespace OpenTK.OpenGL
                 TRUE = ((int)1),
                 FALSE = ((int)0),
             }
-            
+
             public enum Version
             {
                 VERSION_1_1 = ((int)1),
                 VERSION_1_2 = ((int)1),
                 VERSION_1_3 = ((int)1),
             }
-            
+
             public enum StringName
             {
                 VERSION = ((int)100800),
                 EXTENSIONS = ((int)100801),
             }
-            
+
             public enum ErrorCode
             {
                 INVALID_ENUM = ((int)100900),
@@ -30,20 +30,20 @@ namespace OpenTK.OpenGL
                 INVALID_OPERATION = ((int)100904),
                 INVALID_VALUE = ((int)100901),
             }
-            
+
             public enum Filter4TypeSGIS
             {
                 LAGRANGIAN_SGI = ((int)100300),
                 MITCHELL_NETRAVALI_SGI = ((int)100301),
             }
-            
+
             public enum NurbsDisplay
             {
                 FILL = ((int)QuadricDrawStyle.FILL),
                 OUTLINE_POLYGON = ((int)100240),
                 OUTLINE_PATCH = ((int)100241),
             }
-            
+
             public enum NurbsCallback
             {
                 NURBS_END_DATA_EXT = ((int)100175),
@@ -73,7 +73,7 @@ namespace OpenTK.OpenGL
                 NURBS_TEXTURE_COORD = ((int)100168),
                 NURBS_COLOR_EXT = ((int)100167),
             }
-            
+
             public enum NurbsError
             {
                 NURBS_ERROR3 = ((int)100253),
@@ -114,7 +114,7 @@ namespace OpenTK.OpenGL
                 NURBS_ERROR2 = ((int)100252),
                 NURBS_ERROR8 = ((int)100258),
             }
-            
+
             public enum NurbsProperty
             {
                 CULLING = ((int)100201),
@@ -132,7 +132,7 @@ namespace OpenTK.OpenGL
                 NURBS_MODE_EXT = ((int)100160),
                 NURBS_RENDERER = ((int)100162),
             }
-            
+
             public enum NurbsSampling
             {
                 OBJECT_PATH_LENGTH_EXT = ((int)100209),
@@ -143,13 +143,13 @@ namespace OpenTK.OpenGL
                 PARAMETRIC_ERROR = ((int)100216),
                 OBJECT_PARAMETRIC_ERROR_EXT = ((int)100208),
             }
-            
+
             public enum NurbsTrim
             {
                 MAP1_TRIM_3 = ((int)100211),
                 MAP1_TRIM_2 = ((int)100210),
             }
-            
+
             public enum QuadricDrawStyle
             {
                 FILL = ((int)100012),
@@ -157,25 +157,25 @@ namespace OpenTK.OpenGL
                 POINT = ((int)100010),
                 LINE = ((int)100011),
             }
-            
+
             public enum QuadricCallback
             {
                 ERROR = ((int)NurbsCallback.ERROR),
             }
-            
+
             public enum QuadricNormal
             {
                 FLAT = ((int)100001),
                 NONE = ((int)100002),
                 SMOOTH = ((int)100000),
             }
-            
+
             public enum QuadricOrientation
             {
                 INSIDE = ((int)100021),
                 OUTSIDE = ((int)100020),
             }
-            
+
             public enum TessCallback
             {
                 TESS_EDGE_FLAG_DATA = ((int)100110),
@@ -196,7 +196,7 @@ namespace OpenTK.OpenGL
                 TESS_END_DATA = ((int)100108),
                 TESS_COMBINE_DATA = ((int)100111),
             }
-            
+
             public enum TessContour
             {
                 CW = ((int)100120),
@@ -205,14 +205,14 @@ namespace OpenTK.OpenGL
                 UNKNOWN = ((int)100124),
                 CCW = ((int)100121),
             }
-            
+
             public enum TessProperty
             {
                 TESS_BOUNDARY_ONLY = ((int)100141),
                 TESS_TOLERANCE = ((int)100142),
                 TESS_WINDING_RULE = ((int)100140),
             }
-            
+
             public enum TessError
             {
                 TESS_MISSING_END_CONTOUR = ((int)100154),
@@ -230,7 +230,7 @@ namespace OpenTK.OpenGL
                 TESS_NEED_COMBINE_CALLBACK = ((int)100156),
                 TESS_MISSING_BEGIN_CONTOUR = ((int)100152),
             }
-            
+
             public enum TessWinding
             {
                 TESS_WINDING_NONZERO = ((int)100131),
@@ -239,7 +239,7 @@ namespace OpenTK.OpenGL
                 TESS_WINDING_ABS_GEQ_TWO = ((int)100134),
                 TESS_WINDING_NEGATIVE = ((int)100133),
             }
-            
+
             public enum All
             {
                 INTERIOR = ((int)100122),
@@ -396,7 +396,7 @@ namespace OpenTK.OpenGL
                 TESS_ERROR2 = ((int)100152),
                 TESS_WINDING_ODD = ((int)100130),
             }
-            
+
         }
     }
 }