1 files changed, 3 insertions, 39 deletions
diff --git a/make/gl-impl-win32.cfg b/make/gl-impl-win32.cfg
index 252425659..e6f57738f 100644
--- a/make/gl-impl-win32.cfg
+++ b/make/gl-impl-win32.cfg
@@ -3,10 +3,9 @@
 Package net.java.games.jogl
 Style ImplOnly
 JavaClass GL
-ImplPackage net.java.games.jogl.impl.windows
-ImplJavaClass WindowsGLImpl
+ImplPackage net.java.games.jogl.impl
+ImplJavaClass GLImpl
 Include gl-common-win32.cfg
-Include gl-glx-common.cfg
 
 EmitProcAddressTable true
 ProcAddressTableClassName GLProcAddressTable
@@ -23,48 +22,13 @@ CustomCCode /* Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototype
 CustomCCode    "glext.h" are parsed. */
 CustomCCode #define GL_GLEXT_PROTOTYPES
 
-CustomCCode /* Define WGL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-CustomCCode    "wglext.h" are parsed. */
-CustomCCode #define WGL_GLEXT_PROTOTYPES
-
 CustomCCode /* Include the OpenGL headers */
 CustomCCode #include <GL/gl.h>
-CustomCCode #include <GL/wglext.h>
 
 CustomCCode /* This typedef is only needed for VC6 */
 CustomCCode #if _MSC_VER <= 1200
 CustomCCode typedef int intptr_t;
 CustomCCode #endif
 
-CustomJavaCode WindowsGLImpl  public WindowsGLImpl(WindowsGLContext context) { 
-CustomJavaCode WindowsGLImpl    this._context = context; 
-CustomJavaCode WindowsGLImpl  }
-
-CustomJavaCode WindowsGLImpl  public boolean isFunctionAvailable(String glFunctionName)
-CustomJavaCode WindowsGLImpl  {
-CustomJavaCode WindowsGLImpl    return _context.isFunctionAvailable(glFunctionName);
-CustomJavaCode WindowsGLImpl  }
-
-CustomJavaCode WindowsGLImpl  public boolean isExtensionAvailable(String glExtensionName)
-CustomJavaCode WindowsGLImpl  {
-CustomJavaCode WindowsGLImpl    return _context.isExtensionAvailable(glExtensionName);
-CustomJavaCode WindowsGLImpl  }
-
-CustomJavaCode WindowsGLImpl  private WindowsGLContext _context;
-
-CustomJavaCode WindowsGLImpl   /**
-CustomJavaCode WindowsGLImpl    * Provides platform-independent access to the wglAllocateMemoryNV /
-CustomJavaCode WindowsGLImpl    * glXAllocateMemoryNV extension.
-CustomJavaCode WindowsGLImpl    */
-CustomJavaCode WindowsGLImpl   public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-CustomJavaCode WindowsGLImpl     return wglAllocateMemoryNV(arg0, arg1, arg2, arg3);
-CustomJavaCode WindowsGLImpl   }
-
-CustomJavaCode WindowsGLImpl   public void setSwapInterval(int interval) {
-CustomJavaCode WindowsGLImpl     if (isExtensionAvailable("WGL_EXT_swap_control")) {
-CustomJavaCode WindowsGLImpl       wglSwapIntervalEXT(interval);
-CustomJavaCode WindowsGLImpl     }
-CustomJavaCode WindowsGLImpl   }
-
-IncludeAs CustomJavaCode WindowsGLImpl gl-impl-CustomJavaCode.java
+IncludeAs CustomJavaCode GLImpl gl-impl-CustomJavaCode.java
 IncludeAs CustomCCode gl-impl-CustomCCode.c