src/video/x11/SDL_x11window.c
changeset 3057 089a77aebb7d
parent 3052 b7197d7e8566
child 3077 9b58f26ede81
     1.1 --- a/src/video/x11/SDL_x11window.c	Sun Feb 08 15:35:06 2009 +0000
     1.2 +++ b/src/video/x11/SDL_x11window.c	Mon Feb 09 05:32:12 2009 +0000
     1.3 @@ -188,9 +188,6 @@
     1.4      if (window->flags & SDL_WINDOW_OPENGL) {
     1.5          XVisualInfo *vinfo;
     1.6  
     1.7 -        if (X11_GL_Initialize(_this) < 0) {
     1.8 -            return -1;
     1.9 -        }
    1.10          vinfo = X11_GL_GetVisual(_this, data->display, displaydata->screen);
    1.11          if (!vinfo) {
    1.12              return -1;
    1.13 @@ -461,11 +458,6 @@
    1.14                        (CWOverrideRedirect | CWBackPixel | CWBorderPixel |
    1.15                         CWColormap), &xattr);
    1.16      if (!w) {
    1.17 -#ifdef SDL_VIDEO_OPENGL_GLX
    1.18 -        if (window->flags & SDL_WINDOW_OPENGL) {
    1.19 -            X11_GL_Shutdown(_this);
    1.20 -        }
    1.21 -#endif
    1.22          SDL_SetError("Couldn't create window");
    1.23          return -1;
    1.24      }
    1.25 @@ -622,11 +614,6 @@
    1.26      XSetWMProtocols(data->display, w, &data->WM_DELETE_WINDOW, 1);
    1.27  
    1.28      if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) {
    1.29 -#ifdef SDL_VIDEO_OPENGL_GLX
    1.30 -        if (window->flags & SDL_WINDOW_OPENGL) {
    1.31 -            X11_GL_Shutdown(_this);
    1.32 -        }
    1.33 -#endif
    1.34          XDestroyWindow(data->display, w);
    1.35          return -1;
    1.36      }
    1.37 @@ -942,11 +929,6 @@
    1.38                  }
    1.39              }
    1.40          }
    1.41 -#ifdef SDL_VIDEO_OPENGL_GLX
    1.42 -        if (window->flags & SDL_WINDOW_OPENGL) {
    1.43 -            X11_GL_Shutdown(_this);
    1.44 -        }
    1.45 -#endif
    1.46  #ifdef X_HAVE_UTF8_STRING
    1.47          if (data->ic) {
    1.48              XDestroyIC(data->ic);