Mercurial > sdl-ios-xcode

diff src/video/x11/SDL_x11gl_c.h @ 1662:782fd950bd46 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revamp of the video system in progress - adding support for multiple displays, multiple windows, and a full video mode selection API. WARNING: None of the video drivers have been updated for the new API yet! The API is still under design and very fluid. The code is now run through a consistent indent format: indent -i4 -nut -nsc -br -ce The headers are being converted to automatically generate doxygen documentation.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 28 May 2006 13:04:16 +0000
parents 96c2f89cc7e1
children 4da1ee79c9af
line wrap: on
line diff
--- a/src/video/x11/SDL_x11gl_c.h	Sun May 21 17:27:13 2006 +0000
+++ b/src/video/x11/SDL_x11gl_c.h	Sun May 28 13:04:16 2006 +0000
@@ -28,54 +28,39 @@
 
 #include "../SDL_sysvideo.h"
 
-struct SDL_PrivateGLData {
-    int gl_active; /* to stop switching drivers while we have a valid context */
+struct SDL_PrivateGLData
+{
+    int gl_active;              /* to stop switching drivers while we have a valid context */
 
 #if SDL_VIDEO_OPENGL_GLX
-    GLXContext glx_context;	/* Current GL context */
-    XVisualInfo* glx_visualinfo; /* XVisualInfo* returned by glXChooseVisual */
-
-    void * (*glXGetProcAddress)(const GLubyte *procName);
+    GLXContext glx_context;     /* Current GL context */
+    XVisualInfo *glx_visualinfo;        /* XVisualInfo* returned by glXChooseVisual */
 
-    XVisualInfo* (*glXChooseVisual)
-		( Display*		dpy,
-		  int			screen,
-		  int*			attribList );
+    void *(*glXGetProcAddress) (const GLubyte * procName);
+
+    XVisualInfo *(*glXChooseVisual)
+      (Display * dpy, int screen, int *attribList);
 
-    GLXContext (*glXCreateContext)
-		( Display*		dpy,
-		  XVisualInfo*		vis,
-		  GLXContext		shareList,
-		  Bool			direct );
+      GLXContext (*glXCreateContext)
+      (Display * dpy, XVisualInfo * vis, GLXContext shareList, Bool direct);
+
+    void (*glXDestroyContext) (Display * dpy, GLXContext ctx);
 
-    void (*glXDestroyContext)
-		( Display* 		dpy,
-		  GLXContext		ctx );
+      Bool (*glXMakeCurrent)
+      (Display * dpy, GLXDrawable drawable, GLXContext ctx);
 
-    Bool (*glXMakeCurrent)
-		( Display*		dpy,
-		  GLXDrawable		drawable,
-		  GLXContext		ctx );
-
-    void (*glXSwapBuffers)
-		( Display*		dpy,
-		  GLXDrawable		drawable );
+    void (*glXSwapBuffers) (Display * dpy, GLXDrawable drawable);
 
     int (*glXGetConfig)
-	 ( Display* dpy,
-	   XVisualInfo* visual_info,
-	   int attrib,
-	   int* value );
+      (Display * dpy, XVisualInfo * visual_info, int attrib, int *value);
+
+    const char *(*glXQueryExtensionsString) (Display * dpy, int screen);
 
-    const char *(*glXQueryExtensionsString)
-	    ( Display* dpy,
-	      int screen );
+    int (*glXSwapIntervalSGI) (int interval);
+      GLint (*glXSwapIntervalMESA) (unsigned interval);
+      GLint (*glXGetSwapIntervalMESA) (void);
 
-    int (*glXSwapIntervalSGI) ( int interval );
-    GLint (*glXSwapIntervalMESA) ( unsigned interval );
-    GLint (*glXGetSwapIntervalMESA) ( void );
-
-#endif /* SDL_VIDEO_OPENGL_GLX */
+#endif                          /* SDL_VIDEO_OPENGL_GLX */
 };
 
 /* Old variable names */
@@ -84,16 +69,16 @@
 #define glx_visualinfo		(this->gl_data->glx_visualinfo)
 
 /* OpenGL functions */
-extern XVisualInfo *X11_GL_GetVisual(_THIS);
-extern int X11_GL_CreateWindow(_THIS, int w, int h);
-extern int X11_GL_CreateContext(_THIS);
-extern void X11_GL_Shutdown(_THIS);
+extern XVisualInfo *X11_GL_GetVisual (_THIS);
+extern int X11_GL_CreateWindow (_THIS, int w, int h);
+extern int X11_GL_CreateContext (_THIS);
+extern void X11_GL_Shutdown (_THIS);
 #if SDL_VIDEO_OPENGL_GLX
-extern int X11_GL_MakeCurrent(_THIS);
-extern int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value);
-extern void X11_GL_SwapBuffers(_THIS);
-extern int X11_GL_LoadLibrary(_THIS, const char* path);
-extern void *X11_GL_GetProcAddress(_THIS, const char* proc);
+extern int X11_GL_MakeCurrent (_THIS);
+extern int X11_GL_GetAttribute (_THIS, SDL_GLattr attrib, int *value);
+extern void X11_GL_SwapBuffers (_THIS);
+extern int X11_GL_LoadLibrary (_THIS, const char *path);
+extern void *X11_GL_GetProcAddress (_THIS, const char *proc);
 #endif
-extern void X11_GL_UnloadLibrary(_THIS);
-
+extern void X11_GL_UnloadLibrary (_THIS);
+/* vi: set ts=4 sw=4 expandtab: */