We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] vsync patch

sdl-vsync.diff (text/plain), 6.82 KB, created by Ryan C. Gordon on 2006-01-03 11:31:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan C. Gordon

Created: 2006-01-03 11:31:48 UTC

Size: 6.82 KB

patch

obsolete

>Index: include/SDL_video.h
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/include/SDL_video.h,v
>retrieving revision 1.19
>diff -u -r1.19 SDL_video.h
>--- include/SDL_video.h	2 Jan 2005 05:11:16 -0000	1.19
>+++ include/SDL_video.h	6 Mar 2005 15:48:26 -0000
>@@ -218,7 +218,8 @@
>     SDL_GL_ACCUM_ALPHA_SIZE,
>     SDL_GL_STEREO,
>     SDL_GL_MULTISAMPLEBUFFERS,
>-    SDL_GL_MULTISAMPLESAMPLES
>+    SDL_GL_MULTISAMPLESAMPLES,
>+    SDL_GL_SWAP_CONTROL
> } SDL_GLattr;
> 
> /* flags for SDL_SetPalette() */
>Index: src/video/SDL_sysvideo.h
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/SDL_sysvideo.h,v
>retrieving revision 1.23
>diff -u -r1.23 SDL_sysvideo.h
>--- src/video/SDL_sysvideo.h	4 Jan 2004 16:49:21 -0000	1.23
>+++ src/video/SDL_sysvideo.h	6 Mar 2005 15:48:26 -0000
>@@ -306,6 +306,7 @@
> 		int stereo;
> 		int multisamplebuffers;
> 		int multisamplesamples;
>+		int swap_control;
> 		int driver_loaded;
> 		char driver_path[256];
> 		void* dll_handle;
>Index: src/video/SDL_video.c
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/SDL_video.c,v
>retrieving revision 1.50
>diff -u -r1.50 SDL_video.c
>--- src/video/SDL_video.c	25 Jan 2005 16:57:11 -0000	1.50
>+++ src/video/SDL_video.c	6 Mar 2005 15:48:26 -0000
>@@ -235,6 +235,7 @@
> 	video->gl_config.stereo = 0;
> 	video->gl_config.multisamplebuffers = 0;
> 	video->gl_config.multisamplesamples = 0;
>+	video->gl_config.swap_control = -1; /* not known, don't set */
> 	
> 	/* Initialize the video subsystem */
> 	memset(&vformat, 0, sizeof(vformat));
>@@ -1461,6 +1462,8 @@
> 		case SDL_GL_MULTISAMPLESAMPLES:
> 			video->gl_config.multisamplesamples = value;
> 			break;
>+		case SDL_GL_SWAP_CONTROL:
>+			video->gl_config.swap_control = value;
> 		default:
> 			SDL_SetError("Unknown OpenGL attribute");
> 			retval = -1;
>Index: src/video/wincommon/SDL_wingl.c
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/wincommon/SDL_wingl.c,v
>retrieving revision 1.15
>diff -u -r1.15 SDL_wingl.c
>--- src/video/wincommon/SDL_wingl.c	16 May 2004 18:02:48 -0000	1.15
>+++ src/video/wincommon/SDL_wingl.c	6 Mar 2005 15:48:26 -0000
>@@ -290,6 +290,17 @@
> 		return(-1);
> 	}
> 	gl_active = 1;
>+
>+	/* Vsync control under Windows.  Checking glGetString here is
>+	 * somewhat a documented and reliable hack - it was originally
>+	 * as a feature added by mistake, but since so many people rely
>+	 * on it, it will not be removed.  strstr should be safe here.*/
>+	glext = glGetString(GL_EXTENSIONS);
>+	if ( strstr(glext, "WGL_EXT_swap_control")
>+            && this->gl_data->wglSwapIntervalEXT
>+	    && this->gl_config.swap_control >= 0 ) {
>+	  this->gl_data->wglSwapIntervalEXT(this->gl_config.swap_control);
>+	}
> #else
> 	SDL_SetError("WIN driver not configured with OpenGL");
> #endif
>@@ -389,6 +400,12 @@
> 		    case SDL_GL_MULTISAMPLESAMPLES:
> 			wgl_attrib = WGL_SAMPLES_ARB;
> 			break;
>+		    case SDL_GL_SWAP_CONTROL:
>+			if (this->gl_data->wglGetSwapIntervalEXT) {
>+			  return this->gl_data->wglGetSwapIntervalEXT();
>+			} else {
>+			  return -1;
>+			}
> 		    default:
> 			return(-1);
> 		}
>@@ -469,6 +486,8 @@
> 		this->gl_data->wglMakeCurrent = NULL;
> 		this->gl_data->wglChoosePixelFormatARB = NULL;
> 		this->gl_data->wglGetPixelFormatAttribivARB = NULL;
>+		this->gl_data->wglGetSwapIntervalEXT = NULL;
>+		this->gl_data->wglSwapIntervalEXT = NULL;
> 
> 		this->gl_config.dll_handle = NULL;
> 		this->gl_config.driver_loaded = 0;
>@@ -507,6 +526,8 @@
> 		GetProcAddress(handle, "wglDeleteContext");
> 	this->gl_data->wglMakeCurrent = (BOOL (WINAPI *)(HDC, HGLRC))
> 		GetProcAddress(handle, "wglMakeCurrent");
>+	this->gl_data->wglSwapIntervalEXT = (void (WINAPI *)(int));
>+	this->gl_data->wglGetSwapIntervalEXT = (int (WINAPI *)(void));
> 
> 	if ( (this->gl_data->wglGetProcAddress == NULL) ||
> 	     (this->gl_data->wglCreateContext == NULL) ||
>Index: src/video/wincommon/SDL_wingl_c.h
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/wincommon/SDL_wingl_c.h,v
>retrieving revision 1.6
>diff -u -r1.6 SDL_wingl_c.h
>--- src/video/wincommon/SDL_wingl_c.h	4 Jan 2004 16:49:27 -0000	1.6
>+++ src/video/wincommon/SDL_wingl_c.h	6 Mar 2005 15:48:26 -0000
>@@ -57,6 +57,8 @@
>                                                 UINT nAttributes, 
>                                                 const int *piAttributes,
>                                                 int *piValues);
>+    void (*wglSwapIntervalEXT)(int interval);
>+    int (*wglGetSwapIntervalEXT)(void);
> #endif /* HAVE_OPENGL */
> };
> 
>Index: src/video/x11/SDL_x11gl.c
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/x11/SDL_x11gl.c,v
>retrieving revision 1.19
>diff -u -r1.19 SDL_x11gl.c
>--- src/video/x11/SDL_x11gl.c	26 Feb 2004 20:49:45 -0000	1.19
>+++ src/video/x11/SDL_x11gl.c	6 Mar 2005 15:48:26 -0000
>@@ -218,6 +218,15 @@
> 	}
> 
> 	gl_active = 1;
>+
>+	/* The use of strstr here should be safe */
>+	if( strstr(this->gl_data->glXQueryExtensionsString(GFX_Display, 
>+			    XDefaultScreen(GFX_Display)), "SGI_swap_control")
>+	    && this->gl_config.swap_control >= 0
>+	    && this->gl_data->glXSwapIntervalSGI) {
>+	  this->gl_data->glXSwapIntervalSGI(this->gl_config.swap_control);
>+	}
>+
> #else
> 	SDL_SetError("X11 driver not configured with OpenGL");
> #endif
>@@ -379,6 +388,9 @@
>  	    case SDL_GL_MULTISAMPLESAMPLES:
>  		glx_attrib = GLX_SAMPLES_ARB;
>  		break;
>+	    case SDL_GL_SWAP_CONTROL:
>+		/* This is not knowable for GLX, for some reason. */
>+		return -1;
> 	    default:
> 		return(-1);
> 	}
>@@ -407,6 +419,7 @@
> 		this->gl_data->glXDestroyContext = NULL;
> 		this->gl_data->glXMakeCurrent = NULL;
> 		this->gl_data->glXSwapBuffers = NULL;
>+		this->gl_data->glXSwapIntervalSGI = NULL;
> 
> 		this->gl_config.dll_handle = NULL;
> 		this->gl_config.driver_loaded = 0;
>@@ -467,6 +480,8 @@
> 		(int (*)(Display *, XVisualInfo *, int, int *)) dlsym(handle, "glXGetConfig");
> 	this->gl_data->glXQueryExtensionsString =
> 		(const char *(*)(Display *, int)) dlsym(handle, "glXQueryExtensionsString");
>+	this->gl_data->glXSwapIntervalSGI =
>+		(int (*)(int)) dlsym(handle, "glXSwapIntervalSGI");
> 	
> 	/* We don't compare below for this in case we're not using Mesa. */
> 	this->gl_data->glXReleaseBuffersMESA =
>Index: src/video/x11/SDL_x11gl_c.h
>===================================================================
>RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/x11/SDL_x11gl_c.h,v
>retrieving revision 1.8
>diff -u -r1.8 SDL_x11gl_c.h
>--- src/video/x11/SDL_x11gl_c.h	4 Jan 2004 16:49:27 -0000	1.8
>+++ src/video/x11/SDL_x11gl_c.h	6 Mar 2005 15:48:26 -0000
>@@ -81,7 +81,8 @@
> 	    ( Display* dpy,
> 	      int screen);
> 
>-    
>+    int (*glXSwapIntervalSGI) ( int interval );
>+
> #endif /* HAVE_OPENGL */
> };
>

Actions: View | Diff

Attachments on bug 2: 1

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.