--- d3d9patch.2005-04-28-2.diff	2005-04-29 11:17:13.000000000 -0400
+++ d3d9patch.2005-04-30-1.diff	2005-04-30 13:11:47.000000000 -0400
@@ -15745,7 +15745,7 @@
 -      int nCfgs = 0;
 -      int it;
 -      HRESULT hr = D3DERR_NOTAVAILABLE;
--
+-      
 -      WineD3D_Context* ctx = WineD3D_CreateFakeGLContext();
 -      if (NULL != ctx) {
 -	cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs);
@@ -15763,7 +15763,7 @@
 -	return hr;
 -      }
 -    }
--
+-     
 -    return D3DERR_NOTAVAILABLE;
 +    /* TODO: use the real context if it's available */
 +    ctx = WineD3D_CreateFakeGLContext();
@@ -16016,7 +16016,7 @@
  
      IWineD3DImpl    *This = (IWineD3DImpl *)iface;
      BOOL             gotContext  = FALSE;
-     GLint            gl_tex_size = 0;
+     GLint            gl_tex_size = 0;    
      WineD3D_Context *fake_ctx = NULL;
 -    D3DCAPS9        *pCaps = (D3DCAPS9 *)pCapsIn;
  
@@ -28126,7 +28126,7 @@
 diff -X ignore -Nru clean/wine/dlls/x11drv/opengl.c patch/wine/dlls/x11drv/opengl.c
 --- clean/wine/dlls/x11drv/opengl.c	2005-04-28 18:12:00.000000000 +0100
 +++ patch/wine/dlls/x11drv/opengl.c	2005-04-28 23:45:23.000000000 +0100
-@@ -414,14 +414,19 @@
+@@ -456,14 +456,19 @@
  XVisualInfo *X11DRV_setup_opengl_visual( Display *display )
  {
      XVisualInfo *visual = NULL;