Removed bundled GLXAttribute enum.

diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj
index 245b969651d3d897bce8fd316756e90c1877e258..67028445d12eb18075cbd59d99bad66259d2028b 100644 (file)
--- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj
+++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj
@@ -143,7 +143,6 @@
     </Compile>
     <Compile Include="GLWidget.cs" />
     <Compile Include="Win\WinWindowsInfoInitializer.cs" />
-    <Compile Include="X11\GLXAttribute.cs" />
     <Compile Include="X11\XWindowInfoInitializer.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/OpenTK.GLWidget/X11/GLXAttribute.cs b/src/OpenTK.GLWidget/X11/GLXAttribute.cs
deleted file mode 100644 (file)
index 29dbe94..0000000
--- a/src/OpenTK.GLWidget/X11/GLXAttribute.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace OpenTK.X11
-{
-    public enum GLXAttribute
-    {
-        None            = 0,
-        UseGL           = 1,
-        BufferSize      = 2,
-        Level           = 3,
-        RGBA            = 4,
-        DoubleBuffer    = 5,
-        Stereo          = 6,
-        AuxBuffers      = 7,
-        RedSize         = 8,
-        GreenSize       = 9,
-        BlueSize        = 10,
-        AlphaSize       = 11,
-        DepthSize       = 12,
-        StencilSize     = 13,
-        AccumRedSize    = 14,
-        AccumGreenSize  = 15,
-        AccumBlueSize   = 16,
-        AccumAlphaSize  = 17
-    }
-}
\ No newline at end of file

diff --git a/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs b/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs
index 3f06e392d7fff6d704125082fd9162c3324f7e17..b2312b0dc4ab99ef90fa4031aaf3cc1887837daf 100644 (file)
--- a/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs
+++ b/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs
@@ -95,48 +95,48 @@ namespace OpenTK.X11
 
                        if (mode.Buffers > 1)
                        {
-                               attributeList.Add((int)GLXAttribute.DoubleBuffer);
+                               attributeList.Add((int)GLXAttribute.DOUBLEBUFFER);
                        }
 
                        if (mode.Stereo)
                        {
-                               attributeList.Add((int)GLXAttribute.Stereo);
+                               attributeList.Add((int)GLXAttribute.STEREO);
                        }
 
-                       attributeList.Add((int)GLXAttribute.RedSize);
+                       attributeList.Add((int)GLXAttribute.RED_SIZE);
                        attributeList.Add(mode.ColorFormat.Red / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.GreenSize);
+                       attributeList.Add((int)GLXAttribute.GREEN_SIZE);
                        attributeList.Add(mode.ColorFormat.Green / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.BlueSize);
+                       attributeList.Add((int)GLXAttribute.BLUE_SIZE);
                        attributeList.Add(mode.ColorFormat.Blue / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.AlphaSize);
+                       attributeList.Add((int)GLXAttribute.ALPHA_SIZE);
                        attributeList.Add(mode.ColorFormat.Alpha / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.DepthSize);
+                       attributeList.Add((int)GLXAttribute.DEPTH_SIZE);
                        attributeList.Add(mode.Depth);
 
-                       attributeList.Add((int)GLXAttribute.StencilSize);
+                       attributeList.Add((int)GLXAttribute.STENCIL_SIZE);
                        attributeList.Add(mode.Stencil);
 
                        //attributeList.Add(GLX_AUX_BUFFERS);
                        //attributeList.Add(Buffers);
 
-                       attributeList.Add((int)GLXAttribute.AccumRedSize);
+                       attributeList.Add((int)GLXAttribute.ACCUM_RED_SIZE);
                        attributeList.Add(mode.AccumulatorFormat.Red / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.AccumGreenSize);
+                       attributeList.Add((int)GLXAttribute.ACCUM_GREEN_SIZE);
                        attributeList.Add(mode.AccumulatorFormat.Green / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.AccumBlueSize);
+                       attributeList.Add((int)GLXAttribute.ACCUM_BLUE_SIZE);
                        attributeList.Add(mode.AccumulatorFormat.Blue / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.AccumAlphaSize);
+                       attributeList.Add((int)GLXAttribute.ACCUM_ALPHA_SIZE);
                        attributeList.Add(mode.AccumulatorFormat.Alpha / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.None);
+                       attributeList.Add((int)GLXAttribute.NONE);
 
                        return attributeList;
                }