File cr-render-destroy-fix.diff of Package cr

Overview Repositories Revisions Requests Users Attributes Meta

File cr-render-destroy-fix.diff of Package cr

commit ad9e31ca7010a9b289356e52f064994ab376de2d
Author: David Reveman <davidr@novell.com>
Date:   Wed Apr 15 22:37:47 2009 -0400

Fix window and context destruction.

diff --git a/spu/render/renderspu_glx.c b/spu/render/renderspu_glx.c
index b45e83a..14c6bab 100644
--- a/spu/render/renderspu_glx.c
+++ b/spu/render/renderspu_glx.c
@@ -921,15 +921,8 @@ renderspu_SystemDestroyWindow( WindowInfo *window )
 #endif
 		}
 		else {
-			/* The value window->nativeWindow will only be non-NULL if the
-			 * render_to_app_window option is set to true.  In this case, we
-			 * don't want to do anything, since we're not responsible for this
-			 * window.  I know...personal responsibility and all...
-			 */
-			if (!window->nativeWindow) {
-				XDestroyWindow(window->visual->dpy, window->window);
-				XSync(window->visual->dpy, 0);
-			}
+			XDestroyWindow(window->visual->dpy, window->window);
+			XSync(window->visual->dpy, 0);
 		}
 	}
 	window->visual = NULL;
@@ -1127,10 +1120,7 @@ renderspu_SystemDestroyContext( ContextInfo *context )
 	else
 #endif
 	{
-#if 0
-		/* XXX disable for now - causes segfaults w/ NVIDIA's driver */
 		render_spu.ws.glXDestroyContext( context->visual->dpy, context->context );
-#endif
 	}
 	context->visual = NULL;
 	context->context = 0;
@@ -1317,7 +1307,7 @@ renderspu_SystemMakeCurrent( WindowInfo *window, GLint nativeWindow,
 				CRASSERT(window->window);
 				b = render_spu.ws.glXMakeCurrent( window->visual->dpy,
 																			window->window, context->context );
-				CRASSERT(b);
+				/*CRASSERT(b);*/
 
 				if (newContext)
 				{

Places

File cr-render-destroy-fix.diff of Package cr

Places