xserver/hw/xgl xglglx.c,1.9,1.10

David Reveman <xserver-commit-u7BhqnqprCWvj1b/[email protected]> Thu, 30 Jun 2005 20:14:56 -0700 (PDT)
Newsgroups gmane.comp.freedesktop.xserver.cvs
Message-ID <[email protected]>
Committed by: davidr

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv15098/hw/xgl

Modified Files:
	xglglx.c 
Log Message:
Fix return values in Xgl render texture implementation

Index: xglglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglglx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xglglx.c	15 Jun 2005 05:50:15 -0000	1.9
+++ xglglx.c	1 Jul 2005 03:14:54 -0000	1.10
@@ -4378,11 +4378,11 @@
 	
 	/* XXX: front left buffer is only supported so far */
 	if (buffer != GLX_FRONT_LEFT_EXT)
-	    return FALSE;
+	    return BadMatch;
 
 	/* Must be a GLXpixmap */
 	if (!glxPriv->pGlxPixmap)
-	    return FALSE;
+	    return __glXBadDrawable;
 
 	pDrawable = glxPriv->pGlxPixmap->pDraw;
 
@@ -4408,7 +4408,7 @@
 	
 	    pTexObj->pPixmap = pPixmap;
 
-	    return TRUE;
+	    return Success;
 	}
     }
     else if (pBufferPriv->private)
@@ -4422,7 +4422,7 @@
 	return status;
     }
 
-    return FALSE;
+    return __glXBadContext;
 }
 
 static int
@@ -4438,7 +4438,7 @@
 	
 	/* XXX: front left buffer is only supported so far */
 	if (buffer != GLX_FRONT_LEFT_EXT)
-	    return FALSE;
+	    return BadMatch;
 	
 	/* Must be a GLXpixmap */
 	if (glxPriv->pGlxPixmap)
@@ -4453,7 +4453,7 @@
 		(*pDrawable->pScreen->DestroyPixmap) (pTexObj->pPixmap);
 		pTexObj->pPixmap = NULL;
 		
-		return TRUE;
+		return Success;
 	    }
 	    else
 	    {
@@ -4463,7 +4463,7 @@
 		    (*pDrawable->pScreen->DestroyPixmap) (pTexObj->pPixmap);
 		    pTexObj->pPixmap = NULL;
 		    
-		    return TRUE;
+		    return Success;
 		}
 	    }
 	}
@@ -4479,7 +4479,7 @@
 	return status;
     }
     
-    return FALSE;
+    return __glXBadContext;
 }
 
 static void