diff --git a/Source/OpenTK/Graphics/ES11/Helper.cs b/Source/OpenTK/Graphics/ES11/Helper.cs
index a08d8263..98d2f9d0 100644
--- a/Source/OpenTK/Graphics/ES11/Helper.cs
+++ b/Source/OpenTK/Graphics/ES11/Helper.cs
@@ -26,9 +26,9 @@ namespace OpenTK.Graphics.ES11
///
public GL()
{
- EntryPointsInstance = EntryPoints;
- EntryPointNamesInstance = EntryPointNames;
- EntryPointNameOffsetsInstance = EntryPointNameOffsets;
+ _EntryPointsInstance = EntryPoints;
+ _EntryPointNamesInstance = EntryPointNames;
+ _EntryPointNameOffsetsInstance = EntryPointNameOffsets;
}
#endregion
diff --git a/Source/OpenTK/Graphics/ES20/Helper.cs b/Source/OpenTK/Graphics/ES20/Helper.cs
index 60c6fcb4..1307d55d 100644
--- a/Source/OpenTK/Graphics/ES20/Helper.cs
+++ b/Source/OpenTK/Graphics/ES20/Helper.cs
@@ -54,9 +54,9 @@ namespace OpenTK.Graphics.ES20
///
public GL()
{
- EntryPointsInstance = EntryPoints;
- EntryPointNamesInstance = EntryPointNames;
- EntryPointNameOffsetsInstance = EntryPointNameOffsets;
+ _EntryPointsInstance = EntryPoints;
+ _EntryPointNamesInstance = EntryPointNames;
+ _EntryPointNameOffsetsInstance = EntryPointNameOffsets;
}
#endregion
diff --git a/Source/OpenTK/Graphics/ES30/Helper.cs b/Source/OpenTK/Graphics/ES30/Helper.cs
index 222d3091..7fda7c64 100644
--- a/Source/OpenTK/Graphics/ES30/Helper.cs
+++ b/Source/OpenTK/Graphics/ES30/Helper.cs
@@ -54,9 +54,9 @@ namespace OpenTK.Graphics.ES30
///
public GL()
{
- EntryPointsInstance = EntryPoints;
- EntryPointNamesInstance = EntryPointNames;
- EntryPointNameOffsetsInstance = EntryPointNameOffsets;
+ _EntryPointsInstance = EntryPoints;
+ _EntryPointNamesInstance = EntryPointNames;
+ _EntryPointNameOffsetsInstance = EntryPointNameOffsets;
}
#endregion
diff --git a/Source/OpenTK/Graphics/GraphicsBindingsBase.cs b/Source/OpenTK/Graphics/GraphicsBindingsBase.cs
index 96e94796..0b3dc28d 100644
--- a/Source/OpenTK/Graphics/GraphicsBindingsBase.cs
+++ b/Source/OpenTK/Graphics/GraphicsBindingsBase.cs
@@ -39,15 +39,21 @@ namespace OpenTK.Graphics
/// Contains the list of API entry points (function pointers).
/// This field must be set by an inheriting class.
///
+ [Obsolete("Not used - this field remains for 1.1 API compatibility")]
protected IntPtr[] EntryPointsInstance;
///
+ /// with the 1.1 API.
/// Contains the list of API entry point names.
/// This field must be set by an inheriting class.
///
- protected byte[] EntryPointNamesInstance;
+ [Obsolete("Not used - this field remains for 1.1 API compatibility")]
+ protected string[] EntryPointNamesInstance;
- protected int[] EntryPointNameOffsetsInstance;
+
+ internal protected IntPtr[] _EntryPointsInstance;
+ internal protected byte[] _EntryPointNamesInstance;
+ internal protected int[] _EntryPointNameOffsetsInstance;
///
/// Retrieves an unmanaged function pointer to the specified function.
@@ -85,12 +91,12 @@ namespace OpenTK.Graphics
IGraphicsContextInternal context_internal = context as IGraphicsContextInternal;
unsafe
{
- fixed (byte* name = EntryPointNamesInstance)
+ fixed (byte* name = _EntryPointNamesInstance)
{
- for (int i = 0; i < EntryPointsInstance.Length; i++)
+ for (int i = 0; i < _EntryPointsInstance.Length; i++)
{
- EntryPointsInstance[i] = context_internal.GetAddress(
- new IntPtr(name + EntryPointNameOffsetsInstance[i]));
+ _EntryPointsInstance[i] = context_internal.GetAddress(
+ new IntPtr(name + _EntryPointNameOffsetsInstance[i]));
}
}
}
diff --git a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
index f0148d63..808d3829 100644
--- a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs
@@ -91,9 +91,9 @@ namespace OpenTK.Graphics.OpenGL
///
public GL()
{
- EntryPointsInstance = EntryPoints;
- EntryPointNamesInstance = EntryPointNames;
- EntryPointNameOffsetsInstance = EntryPointNameOffsets;
+ _EntryPointsInstance = EntryPoints;
+ _EntryPointNamesInstance = EntryPointNames;
+ _EntryPointNameOffsetsInstance = EntryPointNameOffsets;
}
#endregion
diff --git a/Source/OpenTK/Graphics/OpenGL4/Helper.cs b/Source/OpenTK/Graphics/OpenGL4/Helper.cs
index 9dadde77..d8da0b54 100644
--- a/Source/OpenTK/Graphics/OpenGL4/Helper.cs
+++ b/Source/OpenTK/Graphics/OpenGL4/Helper.cs
@@ -54,9 +54,9 @@ namespace OpenTK.Graphics.OpenGL4
///
public GL()
{
- EntryPointsInstance = EntryPoints;
- EntryPointNamesInstance = EntryPointNames;
- EntryPointNameOffsetsInstance = EntryPointNameOffsets;
+ _EntryPointsInstance = EntryPoints;
+ _EntryPointNamesInstance = EntryPointNames;
+ _EntryPointNameOffsetsInstance = EntryPointNameOffsets;
}
#endregion