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] Cache swap control value for both Mesa and SGI glX extensions.

SDL12-glx-swap-control-RYAN1.diff (text/plain), 3.09 KB, created by Ryan C. Gordon on 2009-10-09 22:41:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan C. Gordon

Created: 2009-10-09 22:41:42 UTC

Size: 3.09 KB

patch

obsolete

>Index: src/video/x11/SDL_x11gl.c
>===================================================================
>--- src/video/x11/SDL_x11gl.c	(revision 4984)
>+++ src/video/x11/SDL_x11gl.c	(working copy)
>@@ -283,16 +283,17 @@
> 	}
> 	if ( !glXExtensionSupported(this, "GLX_MESA_swap_control") ) {
> 		this->gl_data->glXSwapIntervalMESA = NULL;
>-		this->gl_data->glXGetSwapIntervalMESA = NULL;
> 	}
> 	if ( this->gl_config.swap_control >= 0 ) {
>+        int rc = -1;
> 		if ( this->gl_data->glXSwapIntervalMESA ) {
>-			this->gl_data->glXSwapIntervalMESA(this->gl_config.swap_control);
>+			rc = this->gl_data->glXSwapIntervalMESA(this->gl_config.swap_control);
> 		} else if ( this->gl_data->glXSwapIntervalSGI ) {
>-			if (this->gl_data->glXSwapIntervalSGI(this->gl_config.swap_control) == 0) {
>-				this->gl_data->sgi_swap_interval = this->gl_config.swap_control;
>-			}
>+			rc = this->gl_data->glXSwapIntervalSGI(this->gl_config.swap_control);
> 		}
>+		if (rc == 0) {
>+			this->gl_data->swap_interval = this->gl_config.swap_control;
>+		}
> 	}
> #else
> 	SDL_SetError("X11 driver not configured with OpenGL");
>@@ -412,12 +413,10 @@
> 		}
> 		break;
> 	    case SDL_GL_SWAP_CONTROL:
>-		if ( this->gl_data->glXGetSwapIntervalMESA ) {
>-			*value = this->gl_data->glXGetSwapIntervalMESA();
>+		if ( ( this->gl_data->glXSwapIntervalMESA ) ||
>+		     ( this->gl_data->glXSwapIntervalSGI ) ) {
>+			*value = this->gl_data->swap_interval;
> 			return 0;
>-		} else if ( this->gl_data->glXSwapIntervalSGI ) {
>-			*value = this->gl_data->sgi_swap_interval;
>-			return 0;
> 		} else {
> 			unsupported = 1;
> 		}
>@@ -469,7 +468,6 @@
> 		this->gl_data->glXSwapBuffers = NULL;
> 		this->gl_data->glXSwapIntervalSGI = NULL;
> 		this->gl_data->glXSwapIntervalMESA = NULL;
>-		this->gl_data->glXGetSwapIntervalMESA = NULL;
> 
> 		this->gl_config.dll_handle = NULL;
> 		this->gl_config.driver_loaded = 0;
>@@ -530,8 +528,6 @@
> 		(int (*)(int)) GL_LoadFunction(handle, "glXSwapIntervalSGI");
> 	this->gl_data->glXSwapIntervalMESA =
> 		(GLint (*)(unsigned)) GL_LoadFunction(handle, "glXSwapIntervalMESA");
>-	this->gl_data->glXGetSwapIntervalMESA =
>-		(GLint (*)(void)) GL_LoadFunction(handle, "glXGetSwapIntervalMESA");
> 
> 	if ( (this->gl_data->glXChooseVisual == NULL) || 
> 	     (this->gl_data->glXCreateContext == NULL) ||
>Index: src/video/x11/SDL_x11video.c
>===================================================================
>--- src/video/x11/SDL_x11video.c	(revision 4983)
>+++ src/video/x11/SDL_x11video.c	(working copy)
>@@ -122,7 +122,7 @@
> 		SDL_memset(device->gl_data, 0, (sizeof *device->gl_data));
> 
> #if SDL_VIDEO_OPENGL_GLX
>-		device->gl_data->sgi_swap_interval = -1;
>+		device->gl_data->swap_interval = -1;
> #endif
> 
> 		/* Set the driver flags */
>Index: src/video/x11/SDL_x11gl_c.h
>===================================================================
>--- src/video/x11/SDL_x11gl_c.h	(revision 4982)
>+++ src/video/x11/SDL_x11gl_c.h	(working copy)
>@@ -73,9 +73,7 @@
> 
>     int (*glXSwapIntervalSGI) ( int interval );
>     GLint (*glXSwapIntervalMESA) ( unsigned interval );
>-    GLint (*glXGetSwapIntervalMESA) ( void );
>-
>-    int sgi_swap_interval;
>+    int swap_interval;
> #endif /* SDL_VIDEO_OPENGL_GLX */
> };
>

Actions: View | Diff

Attachments on bug 753: 405

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.