From 2186ad22930578699435408a74bb0692f33f8773 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 25 Jun 2017 13:44:19 +0200 Subject: [PATCH] Removed bundled GLXAttribute enum. --- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 1 - src/OpenTK.GLWidget/X11/GLXAttribute.cs | 24 ----------------- .../X11/XWindowInfoInitializer.cs | 26 +++++++++---------- 3 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 src/OpenTK.GLWidget/X11/GLXAttribute.cs diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj index 245b9696..67028445 100644 --- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj +++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj @@ -143,7 +143,6 @@ - diff --git a/src/OpenTK.GLWidget/X11/GLXAttribute.cs b/src/OpenTK.GLWidget/X11/GLXAttribute.cs deleted file mode 100644 index 29dbe943..00000000 --- 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 3f06e392..b2312b0d 100644 --- 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; }