From 5ed98455d9a5b2aa173e18dd71c534d07b143fd4 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Fri, 22 Oct 2010 15:03:06 +0000 Subject: [PATCH] Do not use deprecated methods. --- Source/Examples/OpenGL/1.x/VBODynamic.cs | 4 ++-- Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs | 12 ++++++------ Source/Examples/OpenGL/2.x/SimpleGLSL.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Examples/OpenGL/1.x/VBODynamic.cs b/Source/Examples/OpenGL/1.x/VBODynamic.cs index 72d6bacc..d1831634 100644 --- a/Source/Examples/OpenGL/1.x/VBODynamic.cs +++ b/Source/Examples/OpenGL/1.x/VBODynamic.cs @@ -57,8 +57,8 @@ namespace Examples.Tutorial GL.Hint(HintTarget.PointSmoothHint, HintMode.Nicest); // Setup VBO state - GL.EnableClientState(EnableCap.ColorArray); - GL.EnableClientState(EnableCap.VertexArray); + GL.EnableClientState(ArrayCap.ColorArray); + GL.EnableClientState(ArrayCap.VertexArray); GL.GenBuffers(1, out VBOHandle); diff --git a/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs b/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs index 8935d340..c0457bcd 100644 --- a/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs +++ b/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs @@ -730,9 +730,9 @@ namespace Examples.Tutorial //GL.Arb.DrawArraysInstanced(BeginMode.Triangles, 0, cubeData.Length/8, 1); GL.DrawArrays(BeginMode.Triangles, 0, cubeData.Length / (vboCubeStride / sizeof(float))); - GL.DisableClientState(EnableCap.VertexArray); - GL.DisableClientState(EnableCap.NormalArray); - GL.DisableClientState(EnableCap.TextureCoordArray); + GL.DisableClientState(ArrayCap.VertexArray); + GL.DisableClientState(ArrayCap.NormalArray); + GL.DisableClientState(ArrayCap.TextureCoordArray); } void renderSphereVBO() @@ -753,9 +753,9 @@ namespace Examples.Tutorial //GL.Arb.DrawArraysInstanced(BeginMode.Triangles, 0, cubeData.Length/8, 1); //GL.DrawArrays(BeginMode.Triangles, 0, sphereData.Length / (vboSphereStride / sizeof(float))); - GL.DisableClientState(EnableCap.VertexArray); - GL.DisableClientState(EnableCap.NormalArray); - GL.DisableClientState(EnableCap.TextureCoordArray); + GL.DisableClientState(ArrayCap.VertexArray); + GL.DisableClientState(ArrayCap.NormalArray); + GL.DisableClientState(ArrayCap.TextureCoordArray); } void renderCubemap() diff --git a/Source/Examples/OpenGL/2.x/SimpleGLSL.cs b/Source/Examples/OpenGL/2.x/SimpleGLSL.cs index 8d55db3d..319ac663 100644 --- a/Source/Examples/OpenGL/2.x/SimpleGLSL.cs +++ b/Source/Examples/OpenGL/2.x/SimpleGLSL.cs @@ -261,8 +261,8 @@ namespace Examples.Tutorial //GL.DrawArrays(GL.Enums.BeginMode.POINTS, 0, shape.Vertices.Length); - GL.DisableClientState(EnableCap.VertexArray); - GL.DisableClientState(EnableCap.ColorArray); + GL.DisableClientState(ArrayCap.VertexArray); + GL.DisableClientState(ArrayCap.ColorArray); //int error = GL.GetError();