opengl32: Get rid of X/GLX leftovers.

dlls/opengl32/opengl_ext.h

@@ -26,7 +26,6 @@
 #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
-#include <GL/glx.h>
 #ifdef HAVE_GL_GLEXT_H
 # include <GL/glext.h>
 #endif

dlls/opengl32/wgl.c

@@ -82,9 +82,6 @@ static char* internal_gl_extensions = NULL;
 
 typedef struct wine_glcontext {
   HDC hdc;
-  XVisualInfo *vis;
-  GLXFBConfig fb_conf;
-  GLXContext ctx;
   BOOL do_escape;
   /* ... more stuff here */
 } Wine_GLContext;

dlls/winex11.drv/opengl.c

@@ -104,10 +104,10 @@ typedef struct wine_glpixelformat {
 
 typedef struct wine_glcontext {
     HDC hdc;
+    BOOL do_escape;
     XVisualInfo *vis;
     WineGLPixelFormat *fmt;
     GLXContext ctx;
-    BOOL do_escape;
     HDC read_hdc;
     Drawable drawables[2];
     BOOL refresh_drawables;