[Xquartz-changes] [192] AppleSGLX/trunk/glxcurrent.c

[source_changes at macosforge.org]

Revision: 192
          http://trac.macosforge.org/projects/xquartz/changeset/192
Author:   gstaplin at apple.com
Date:     2009-02-19 19:56:39 -0800 (Thu, 19 Feb 2009)
Log Message:
-----------
Remove a test for a non-NULL context in MakeContextCurrent.

The test was added before the patterns were added for calling
apple_cgl.set_current_context(NULL) in the case of a NULL gc.

Tested with builds/create_destroy_context_alone and
builds/create_destroy_context_with_drawable.

Modified Paths:
--------------
    AppleSGLX/trunk/glxcurrent.c

Modified: AppleSGLX/trunk/glxcurrent.c
===================================================================
--- AppleSGLX/trunk/glxcurrent.c	2009-02-20 03:51:10 UTC (rev 191)
+++ AppleSGLX/trunk/glxcurrent.c	2009-02-20 03:56:39 UTC (rev 192)
@@ -137,12 +137,10 @@
 {
     const GLXContext oldGC = __glXGetCurrentContext();
      
-    if(gc) {
-	if(apple_glx_make_current_context(dpy, oldGC ? oldGC->apple : NULL, 
-					  gc ? gc->apple : NULL,
-					  draw))
-	    return GL_FALSE;
-    }
+    if(apple_glx_make_current_context(dpy, oldGC ? oldGC->apple : NULL, 
+				      gc ? gc->apple : NULL,
+				      draw))
+	return GL_FALSE;
     
     __glXLock();
    
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20090219/a1664c8d/attachment-0001.html>