diff src/video/x11/SDL_x11gl.c @ 1575:3ba88cb7eb1b

Updated dynamic X11 code. See details in Bugzilla #170.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 22 Mar 2006 05:00:59 +0000
parents d910939febfa
children d75c2d78e87d
line wrap: on
line diff
--- a/src/video/x11/SDL_x11gl.c	Wed Mar 22 04:51:44 2006 +0000
+++ b/src/video/x11/SDL_x11gl.c	Wed Mar 22 05:00:59 2006 +0000
@@ -64,10 +64,10 @@
 		XVisualInfo vi_in;
 		int out_count;
 
-		pXGetWindowAttributes(SDL_Display, SDL_Window, &a);
+		XGetWindowAttributes(SDL_Display, SDL_Window, &a);
 		vi_in.screen = SDL_Screen;
-		vi_in.visualid = pXVisualIDFromVisual(a.visual);
-		glx_visualinfo = pXGetVisualInfo(SDL_Display,
+		vi_in.visualid = XVisualIDFromVisual(a.visual);
+		glx_visualinfo = XGetVisualInfo(SDL_Display,
 	                     VisualScreenMask|VisualIDMask, &vi_in, &out_count);
 		return glx_visualinfo;
 	}
@@ -186,7 +186,7 @@
 	attributes.colormap = SDL_XColorMap;
 	mask = CWBackPixel | CWBorderPixel | CWColormap;
 
-	SDL_Window = pXCreateWindow(SDL_Display, WMwindow,
+	SDL_Window = XCreateWindow(SDL_Display, WMwindow,
 			0, 0, w, h, 0, glx_visualinfo->depth,
 			InputOutput, glx_visualinfo->visual,
 			mask, &attributes);
@@ -207,10 +207,10 @@
 	int retval;
 #if SDL_VIDEO_OPENGL_GLX
 	/* We do this to create a clean separation between X and GLX errors. */
-	pXSync( SDL_Display, False );
+	XSync( SDL_Display, False );
 	glx_context = this->gl_data->glXCreateContext(GFX_Display, 
 				     glx_visualinfo, NULL, True);
-	pXSync( GFX_Display, False );
+	XSync( GFX_Display, False );
 
 	if (glx_context == NULL) {
 		SDL_SetError("Could not create GL context");
@@ -258,7 +258,7 @@
 		SDL_SetError("Unable to make GL context current");
 		retval = -1;
 	}
-	pXSync( GFX_Display, False );
+	XSync( GFX_Display, False );
 
 	/* More Voodoo X server workarounds... Grr... */
 	SDL_Lock_EventThread();