winex11: Store the GL-specific information in the GL driver physdev.

dlls/winex11.drv/bitmap.c

@@ -100,7 +100,6 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
 
     physDev->bitmap = physBitmap;
     physDev->drawable = physBitmap->pixmap;
-    physDev->gl_drawable = physBitmap->glxpixmap;
     physDev->color_shifts = physBitmap->trueColor ? &physBitmap->color_shifts : NULL;
     SetRect( &physDev->drawable_rect, 0, 0, bitmap.bmWidth, bitmap.bmHeight );
     physDev->dc_rect = physDev->drawable_rect;

dlls/winex11.drv/init.c

@@ -354,16 +354,11 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
                     physDev->dc_rect = data->dc_rect;
                     physDev->drawable = data->drawable;
                     physDev->drawable_rect = data->drawable_rect;
-                    physDev->current_pf = pixelformat_from_fbconfig_id( data->fbconfig_id );
-                    physDev->gl_drawable = data->gl_drawable;
-                    physDev->pixmap = data->pixmap;
-                    physDev->gl_type = data->gl_type;
                     wine_tsx11_lock();
                     XSetSubwindowMode( gdi_display, physDev->gc, data->mode );
                     wine_tsx11_unlock();
-                    TRACE( "SET_DRAWABLE hdc %p drawable %lx gl_drawable %lx pf %u gl %u dc_rect %s drawable_rect %s\n",
-                           dev->hdc, physDev->drawable, physDev->gl_drawable, physDev->current_pf,
-                           physDev->gl_type, wine_dbgstr_rect(&physDev->dc_rect),
+                    TRACE( "SET_DRAWABLE hdc %p drawable %lx dc_rect %s drawable_rect %s\n",
+                           dev->hdc, physDev->drawable, wine_dbgstr_rect(&physDev->dc_rect),
                            wine_dbgstr_rect(&physDev->drawable_rect) );
                     return TRUE;
                 }
@@ -428,9 +423,8 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
                     return TRUE;
                 }
                 break;
-            case X11DRV_FLUSH_GL_DRAWABLE:
-                flush_gl_drawable(physDev);
-                return TRUE;
+            default:
+                break;
             }
         }
         break;

dlls/winex11.drv/x11drv.h

@@ -141,10 +141,6 @@ typedef struct
     int           depth;       /* bit depth of the DC */
     ColorShifts  *color_shifts; /* color shifts of the DC */
     int           exposures;   /* count of graphics exposures operations */
-    int           current_pf;
-    Drawable      gl_drawable;
-    Pixmap        pixmap;      /* Pixmap for a GLXPixmap gl_drawable */
-    enum dc_gl_type gl_type;  /* type of GL device context */
 } X11DRV_PDEVICE;
 
 static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev )
@@ -602,11 +598,9 @@ extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) DECLSPEC_HIDD
 extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN;
 extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;
 
-extern int pixelformat_from_fbconfig_id( XID fbconfig_id ) DECLSPEC_HIDDEN;
 extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) DECLSPEC_HIDDEN;
 extern void mark_drawable_dirty( Drawable old, Drawable new ) DECLSPEC_HIDDEN;
 extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap parent ) DECLSPEC_HIDDEN;
-extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN;
 
 extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ) DECLSPEC_HIDDEN;
 extern Window init_clip_window(void) DECLSPEC_HIDDEN;