src/video/x11/SDL_x11gl.c
changeset 1575 3ba88cb7eb1b
parent 1402 d910939febfa
child 1577 d75c2d78e87d
     1.1 --- a/src/video/x11/SDL_x11gl.c	Wed Mar 22 04:51:44 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11gl.c	Wed Mar 22 05:00:59 2006 +0000
     1.3 @@ -64,10 +64,10 @@
     1.4  		XVisualInfo vi_in;
     1.5  		int out_count;
     1.6  
     1.7 -		pXGetWindowAttributes(SDL_Display, SDL_Window, &a);
     1.8 +		XGetWindowAttributes(SDL_Display, SDL_Window, &a);
     1.9  		vi_in.screen = SDL_Screen;
    1.10 -		vi_in.visualid = pXVisualIDFromVisual(a.visual);
    1.11 -		glx_visualinfo = pXGetVisualInfo(SDL_Display,
    1.12 +		vi_in.visualid = XVisualIDFromVisual(a.visual);
    1.13 +		glx_visualinfo = XGetVisualInfo(SDL_Display,
    1.14  	                     VisualScreenMask|VisualIDMask, &vi_in, &out_count);
    1.15  		return glx_visualinfo;
    1.16  	}
    1.17 @@ -186,7 +186,7 @@
    1.18  	attributes.colormap = SDL_XColorMap;
    1.19  	mask = CWBackPixel | CWBorderPixel | CWColormap;
    1.20  
    1.21 -	SDL_Window = pXCreateWindow(SDL_Display, WMwindow,
    1.22 +	SDL_Window = XCreateWindow(SDL_Display, WMwindow,
    1.23  			0, 0, w, h, 0, glx_visualinfo->depth,
    1.24  			InputOutput, glx_visualinfo->visual,
    1.25  			mask, &attributes);
    1.26 @@ -207,10 +207,10 @@
    1.27  	int retval;
    1.28  #if SDL_VIDEO_OPENGL_GLX
    1.29  	/* We do this to create a clean separation between X and GLX errors. */
    1.30 -	pXSync( SDL_Display, False );
    1.31 +	XSync( SDL_Display, False );
    1.32  	glx_context = this->gl_data->glXCreateContext(GFX_Display, 
    1.33  				     glx_visualinfo, NULL, True);
    1.34 -	pXSync( GFX_Display, False );
    1.35 +	XSync( GFX_Display, False );
    1.36  
    1.37  	if (glx_context == NULL) {
    1.38  		SDL_SetError("Could not create GL context");
    1.39 @@ -258,7 +258,7 @@
    1.40  		SDL_SetError("Unable to make GL context current");
    1.41  		retval = -1;
    1.42  	}
    1.43 -	pXSync( GFX_Display, False );
    1.44 +	XSync( GFX_Display, False );
    1.45  
    1.46  	/* More Voodoo X server workarounds... Grr... */
    1.47  	SDL_Lock_EventThread();