xserver: Branch 'xorg-server-1.2-apple' - 2 commits

[Jeremy Huddleston]

 GL/glx/glxdri.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b01e634a04d7f0fad0aee00076654d508fde68fe
Merge: ed3d7b3... 817b200...
Author: Jeremy Huddleston <jeremy at tifa.local>
Date:   Sat Mar 1 17:11:01 2008 -0800

    Merge branch 'server-1.3-branch' into xorg-server-1.2-apple

commit 817b20030b073f9e92c77c0f6887d080c99ae6df
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Wed Feb 27 16:49:34 2008 +0000

    Fix context sharing between direct/indirect contexts

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 788b87d..6d5d9d7 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -472,6 +472,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
     else
 	sharePrivate = NULL;
 
+    if (baseShareContext && baseShareContext->isDirect)
+        return NULL;
+
     context = xalloc(sizeof *context);
     if (context == NULL)
 	return NULL;
@@ -490,6 +493,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
 					   0, /* render type */
 					   sharePrivate,
 					   &context->driContext);
+    
+    if (!context->driContext.private) {
+    	xfree(context);
+    	return NULL;
+    }
 
     context->driContext.mode = modes;
 
@@ -815,7 +823,6 @@ static Bool
 glxDRIEnterVT (int index, int flags)
 {
     __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
-    Bool ret;
 
     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");