Full merge from trunk.

66 files changed, 13267 insertions, 2164 deletions

diff --git a/xc/programs/Xserver/GL/dri/dri.c b/xc/programs/Xserver/GL/dri/dri.c
index 03f86330c..0f62df601 100644
--- a/xc/programs/Xserver/GL/dri/dri.c
+++ b/xc/programs/Xserver/GL/dri/dri.c
@@ -165,7 +165,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 		   0,
 		   pDRIPriv->pDriverInfo->SAREASize,
 		   DRM_SHM,
-		   DRM_CONTAINS_LOCK, 
+		   DRM_CONTAINS_LOCK,
 		   &pDRIPriv->hSAREA) < 0)
     {
 	pDRIPriv->directRenderingSupport = FALSE;
@@ -179,7 +179,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 	      "[drm] added %d byte SAREA at 0x%08lx\n",
 	      pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);
 
-    if (drmMap( pDRIPriv->drmFD, 
+    if (drmMap( pDRIPriv->drmFD,
 		pDRIPriv->hSAREA,
 		pDRIPriv->pDriverInfo->SAREASize,
 		(drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)
@@ -194,12 +194,12 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);
     DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA 0x%08lx to %p\n",
 	      pDRIPriv->hSAREA, pDRIPriv->pSAREA);
-    
-    if (drmAddMap( pDRIPriv->drmFD, 
+
+    if (drmAddMap( pDRIPriv->drmFD,
 		   (drmHandle)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress,
 		   pDRIPriv->pDriverInfo->frameBufferSize,
-		   DRM_FRAME_BUFFER, 
-		   0, 
+		   DRM_FRAME_BUFFER,
+		   0,
 		   &pDRIPriv->hFrameBuffer) < 0)
     {
 	pDRIPriv->directRenderingSupport = FALSE;
@@ -234,7 +234,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     /* validate max drawable table entry set by driver */
     if ((pDRIPriv->pDriverInfo->maxDrawableTableEntry <= 0) ||
         (pDRIPriv->pDriverInfo->maxDrawableTableEntry > SAREA_MAX_DRAWABLES)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "Invalid max drawable table size set by driver: %d\n",
 		      pDRIPriv->pDriverInfo->maxDrawableTableEntry);
     }
@@ -266,7 +266,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
     if (!(pDRIContextPriv = DRICreateContextPriv(pScreen,
 						 &pDRIPriv->myContext,
 						 flags))) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
 		  "failed to create server context\n");
 	return FALSE;
     }
@@ -289,12 +289,12 @@ DRIFinishScreenInit(ScreenPtr pScreen)
 	/* Server will handle 3D swaps, and hide 2D swaps from kernel.
 	 * Register server context as a preserved context.
 	 */
-	
+
 	/* allocate memory for hidden context store */
 	pDRIPriv->hiddenContextStore
 	    = (void *)xcalloc(1, pDRIInfo->contextSize);
 	if (!pDRIPriv->hiddenContextStore) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "failed to allocate hidden context\n");
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return FALSE;
@@ -304,17 +304,17 @@ DRIFinishScreenInit(ScreenPtr pScreen)
 	pDRIPriv->partial3DContextStore
 	    = (void *)xcalloc(1, pDRIInfo->contextSize);
 	if (!pDRIPriv->partial3DContextStore) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "[DRI] failed to allocate partial 3D context\n");
 	    xfree(pDRIPriv->hiddenContextStore);
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return FALSE;
 	}
-	
+
 	/* save initial context store */
 	if (pDRIInfo->SwapContext) {
 	    (*pDRIInfo->SwapContext)(
-		pScreen, 
+		pScreen,
 		DRI_NO_SYNC,
 		DRI_2D_CONTEXT,
 		pDRIPriv->hiddenContextStore,
@@ -328,7 +328,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
          * setup signal handler for receiving swap requests from kernel
 	 */
 	if (!drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "[drm] failed to setup DRM signal handler\n");
 	    if (pDRIPriv->hiddenContextStore)
 		xfree(pDRIPriv->hiddenContextStore);
@@ -337,7 +337,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return FALSE;
 	} else {
-	    DRIDrvMsg(pScreen->myNum, X_INFO, 
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
 		      "[drm] installed DRM signal handler\n");
 	}
 
@@ -377,7 +377,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
 	pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
 	pScrn->AdjustFrame         = pDRIInfo->wrap.AdjustFrame;
     }
-   
+
     DRIDrvMsg(pScreen->myNum, X_INFO, "[DRI] installation complete\n");
 
     return TRUE;
@@ -400,13 +400,13 @@ DRICloseScreen(ScreenPtr pScreen)
 
 	if (pDRIPriv->pDriverInfo->driverSwapMethod != DRI_KERNEL_SWAP) {
 	    if (!drmRemoveSIGIOHandler(pDRIPriv->drmFD)) {
-		DRIDrvMsg(pScreen->myNum, X_ERROR, 
+		DRIDrvMsg(pScreen->myNum, X_ERROR,
 			  "[drm] failed to remove DRM signal handler\n");
 	    }
 	}
 
 	if (!DRIDestroyContextPriv(pDRIPriv->myContextPriv)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "failed to destroy server context\n");
 	}
 
@@ -440,7 +440,7 @@ DRICloseScreen(ScreenPtr pScreen)
 		      pDRIPriv->hSAREA,
 		      pDRIPriv->pSAREA);
 	}
-	    
+
 	drmClose(pDRIPriv->drmFD);
 	xfree(pDRIPriv);
 	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
@@ -457,7 +457,7 @@ DRIExtensionInit(void)
 	return FALSE;
     }
 
-    /* Allocate a window private index with a zero sized private area for 
+    /* Allocate a window private index with a zero sized private area for
      * each window, then should a window become a DRI window, we'll hang
      * a DRIWindowPrivateRec off of this private index.
      */
@@ -550,7 +550,7 @@ DRIGetClientDriverName(ScreenPtr pScreen,
 
 /* DRICreateContextPriv and DRICreateContextPrivFromHandle are helper
    functions that layer on drmCreateContext and drmAddContextTag.
-   
+
    DRICreateContextPriv always creates a kernel drmContext and then calls
    DRICreateContextPrivFromHandle to create a DRIContextPriv structure for
    DRI tracking.  For the SIGIO handler, the drmContext is associated with
@@ -591,7 +591,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen,
     pDRIContextPriv->pContextStore = (void *)(pDRIContextPriv + 1);
 
     drmAddContextTag(pDRIPriv->drmFD, hHWContext, pDRIContextPriv);
-    
+
     pDRIContextPriv->hwContext = hHWContext;
     pDRIContextPriv->pScreen   = pScreen;
     pDRIContextPriv->flags     = flags;
@@ -601,7 +601,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen,
 	if (drmSetContextFlags(pDRIPriv->drmFD,
 			       hHWContext,
 			       DRM_CONTEXT_2DONLY)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "[drm] failed to set 2D context flag\n");
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return NULL;
@@ -611,7 +611,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen,
 	if (drmSetContextFlags(pDRIPriv->drmFD,
 			       hHWContext,
 			       DRM_CONTEXT_PRESERVED)) {
-	    DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
 		      "[drm] failed to set preserved flag\n");
 	    DRIDestroyContextPriv(pDRIContextPriv);
 	    return NULL;
@@ -626,7 +626,7 @@ DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv)
     DRIScreenPrivPtr pDRIPriv;
 
     if (!pDRIContextPriv) return TRUE;
-    
+
     pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);
 
     if (!(pDRIContextPriv->flags & DRI_CONTEXT_RESERVED)) {
@@ -670,14 +670,14 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
 	/* No matching GLX visual found */
 	return FALSE;
     }
-    
+
     if (!(pDRIContextPriv = DRICreateContextPriv(pScreen, pHWContext, 0))) {
 	return FALSE;
     }
 
     contextStore=DRIGetContextStore(pDRIContextPriv);
     if (pDRIPriv->pDriverInfo->CreateContext) {
-	if (!((*pDRIPriv->pDriverInfo->CreateContext)(pScreen, visual, 
+	if (!((*pDRIPriv->pDriverInfo->CreateContext)(pScreen, visual,
 		*pHWContext, *pVisualConfigPriv,
 		(DRIContextType)(long)contextStore))) {
 	    DRIDestroyContextPriv(pDRIContextPriv);
@@ -721,9 +721,9 @@ DRIContextPrivDelete(pointer pResource, XID id)
  * in the case of transition from private to shared backbuffers.  It's
  * not necessary for correctness, because DRIClipNotify gets called in
  * time to prevent any conflict, but the transition from
- * shared->private is sometimes missed if we don't do this.  
+ * shared->private is sometimes missed if we don't do this.
  */
-static void 
+static void
 DRIClipNotifyAllDrawables(ScreenPtr pScreen)
 {
    int i;
@@ -731,11 +731,11 @@ DRIClipNotifyAllDrawables(ScreenPtr pScreen)
 
    for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
       pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;
-   }   
+   }
 }
 
 
-static void 
+static void
 DRITransitionToSharedBuffers(ScreenPtr pScreen)
 {
 /*     ErrorF("DRITransitionToSharedBuffers\n"); */
@@ -743,7 +743,7 @@ DRITransitionToSharedBuffers(ScreenPtr pScreen)
 }
 
 
-static void 
+static void
 DRITransitionToPrivateBuffers(ScreenPtr pScreen)
 {
 /*     ErrorF("DRITransitionToPrivateBuffers\n"); */
@@ -808,7 +808,7 @@ DRICreateDrawable(ScreenPtr pScreen, Drawable id,
 	    pDRIDrawablePriv->drawableIndex = -1;
 
 	    /* save private off of preallocated index */
-	    pWin->devPrivates[DRIWindowPrivIndex].ptr = 
+	    pWin->devPrivates[DRIWindowPrivIndex].ptr =
 						(pointer)pDRIDrawablePriv;
 
 	    switch (++pDRIPriv->nrWindows) {
@@ -847,7 +847,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable)
 	pDRIDrawablePriv->refCount--;
 	if (pDRIDrawablePriv->refCount <= 0) {
 	    /* This calls back DRIDrawablePrivDelete which frees private area */
-	    FreeResourceByType(id, DRIDrawablePrivResType, FALSE);	    
+	    FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
 	}
     }
     else { /* pixmap (or for GLX 1.3, a PBuffer) */
@@ -875,7 +875,7 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
 	    pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
 	}
 
-	if (drmDestroyDrawable(pDRIPriv->drmFD, 
+	if (drmDestroyDrawable(pDRIPriv->drmFD,
 			       pDRIDrawablePriv->hwDrawable)) {
 	    return FALSE;
 	}
@@ -937,7 +937,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 		    if (!(pDRIPriv->DRIDrawables[i])) {
 			pDRIPriv->DRIDrawables[i] = pDrawable;
 			pDRIDrawablePriv->drawableIndex = i;
-			pDRIPriv->pSAREA->drawableTable[i].stamp = 
+			pDRIPriv->pSAREA->drawableTable[i].stamp =
 					    DRIDrawableValidationStamp++;
 			break;
 		    }
@@ -950,10 +950,10 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
                     int oldestIndex = 0;
 		    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
 		    while (i--) {
-			if (pDRIPriv->pSAREA->drawableTable[i].stamp < 
+			if (pDRIPriv->pSAREA->drawableTable[i].stamp <
 								oldestStamp) {
 			    oldestIndex = i;
-			    oldestStamp = 
+			    oldestStamp =
 				pDRIPriv->pSAREA->drawableTable[i].stamp;
 			}
 		    }
@@ -968,15 +968,15 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 		    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
 
 		    /* validate SAREA entry */
-		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp = 
+		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =
 					DRIDrawableValidationStamp++;
 
 		    /* check for stamp wrap around */
 		    if (oldestStamp > DRIDrawableValidationStamp) {
 
 			/* walk SAREA table and invalidate all drawables */
-			for( i=0; 
-                             i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; 
+			for( i=0;
+                             i < pDRIPriv->pDriverInfo->maxDrawableTableEntry;
                              i++) {
 				pDRIPriv->pSAREA->drawableTable[i].stamp =
 					DRIDrawableValidationStamp++;
@@ -992,10 +992,10 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 				pDRIDrawablePriv->drawableIndex);
 
 		/* reinit drawable ID if window is visible */
-		if ((pWin->viewable) && 
+		if ((pWin->viewable) &&
 		    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS))
 		{
-		    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, 
+		    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin,
 			    &pWin->clipList, pDRIDrawablePriv->drawableIndex);
 		}
 	    }
@@ -1023,7 +1023,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 		*numClipRects = 1;
 		*pClipRects   = &pDRIPriv->fullscreen_rect;
 	    }
-	    
+
 	    *backX = *X;
 	    *backY = *Y;
 
@@ -1173,7 +1173,7 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData,
     }
 }
 
-void 
+void
 DRIDoBlockHandler(int screenNum, pointer blockData,
                   pointer pTimeout, pointer pReadmask)
 {
@@ -1192,7 +1192,7 @@ DRIDoBlockHandler(int screenNum, pointer blockData,
     DRIUnlock(pScreen);
 }
 
-void 
+void
 DRISwapContext(int drmFD, void *oldctx, void *newctx)
 {
     DRIContextPrivPtr oldContext      = (DRIContextPrivPtr)oldctx;
@@ -1235,7 +1235,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 #endif
 
     if (!pDRIPriv->pDriverInfo->SwapContext) {
-	DRIDrvMsg(pScreen->myNum, X_ERROR, 
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
 		  "[DRI] DDX driver missing context swap call back\n");
 	return;
     }
@@ -1251,7 +1251,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 	    oldContextType      = DRI_NO_CONTEXT;
 	}
 	newContextStore = DRIGetContextStore(newContext);
-	if ((newContext->valid3D) && 
+	if ((newContext->valid3D) &&
 	  (newContext->hwContext != pDRIPriv->myContext)) {
 	    newContextType = DRI_3D_CONTEXT;
 	}
@@ -1265,8 +1265,8 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
         /* optimize 2D context swaps */
 
 	if (newContext->flags & DRI_CONTEXT_2DONLY) {
-	    /* go from 3D context to 2D context and only save 2D 
-             * subset of 3D state 
+	    /* go from 3D context to 2D context and only save 2D
+             * subset of 3D state
              */
 	    oldContextStore = DRIGetContextStore(oldContext);
 	    oldContextType = DRI_2D_CONTEXT;
@@ -1277,8 +1277,8 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 	}
 	else if (oldContext->flags & DRI_CONTEXT_2DONLY) {
 	    if (pDRIPriv->lastPartial3DContext == newContext) {
-		/* go from 2D context back to previous 3D context and 
-		 * only restore 2D subset of previous 3D state 
+		/* go from 2D context back to previous 3D context and
+		 * only restore 2D subset of previous 3D state
 		 */
 		oldContextStore = DRIGetContextStore(oldContext);
 		oldContextType = DRI_2D_CONTEXT;
@@ -1291,7 +1291,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 
 		/* call DDX driver to do partial restore */
 		oldContextStore = DRIGetContextStore(oldContext);
-		newContextStore = 
+		newContextStore =
 			DRIGetContextStore(pDRIPriv->lastPartial3DContext);
 		(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
 						      DRI_2D_SYNC,
@@ -1305,7 +1305,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 		oldContext->valid3D = TRUE;
 		oldContextType = DRI_3D_CONTEXT;
 		newContextStore = DRIGetContextStore(newContext);
-		if ((newContext->valid3D) && 
+		if ((newContext->valid3D) &&
 		  (newContext->hwContext != pDRIPriv->myContext)) {
 		    newContextType = DRI_3D_CONTEXT;
 		}
@@ -1321,7 +1321,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 	    oldContext->valid3D = TRUE;
 	    oldContextType = DRI_3D_CONTEXT;
 	    newContextStore = DRIGetContextStore(newContext);
-	    if ((newContext->valid3D) && 
+	    if ((newContext->valid3D) &&
 	      (newContext->hwContext != pDRIPriv->myContext)) {
 		newContextType = DRI_3D_CONTEXT;
 	    }
@@ -1341,33 +1341,33 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 					  newContextStore);
 }
 
-void* 
+void*
 DRIGetContextStore(DRIContextPrivPtr context)
 {
     return((void *)context->pContextStore);
 }
 
-void 
+void
 DRIPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
-    /* NOT_DONE: HACK until we have newly transitioned 3D->2D 
-     * windows computed 
+    /* NOT_DONE: HACK until we have newly transitioned 3D->2D
+     * windows computed
      */
     if(what == PW_BACKGROUND) {
 	if ((pDRIPriv->pDriverInfo->bufferRequests == DRI_3D_WINDOWS_ONLY) &&
 	      (pDRIDrawablePriv)) {
 
-	    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn, 
+	    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn,
 				    pDRIDrawablePriv->drawableIndex);
 	}
 	else if (pDRIPriv->pDriverInfo->bufferRequests == DRI_ALL_WINDOWS) {
 	    if (pDRIDrawablePriv) {
 
-		(*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn, 
+		(*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn,
 					pDRIDrawablePriv->drawableIndex);
 	    }
 	    else {
@@ -1409,7 +1409,7 @@ DRIPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     }
 }
 
-void 
+void
 DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -1606,7 +1606,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
     }
 }
 
-CARD32 
+CARD32
 DRIGetDrawableIndex(WindowPtr pWin)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -1624,7 +1624,7 @@ DRIGetDrawableIndex(WindowPtr pWin)
     return index;
 }
 
-unsigned int 
+unsigned int
 DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1636,56 +1636,62 @@ void
 DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    
+
     ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);
 }
 
 void
-DRILock(ScreenPtr pScreen, int flags) {
+DRILock(ScreenPtr pScreen, int flags)
+{
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-   
+
     if (!lockRefCount)
-      DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext, flags);
+        DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext, flags);
     lockRefCount++;
 }
 
 void
-DRIUnlock(ScreenPtr pScreen) {
+DRIUnlock(ScreenPtr pScreen)
+{
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if (lockRefCount>0) lockRefCount--;
+    if (lockRefCount > 0) {
+        lockRefCount--;
+    }
     else {
-      ErrorF("DRIUnlock called when not locked\n");
-      return;
+        ErrorF("DRIUnlock called when not locked\n");
+        return;
     }
     if (!lockRefCount)
-      DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext);
+        DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pSAREA, pDRIPriv->myContext);
 }
 
 void *
 DRIGetSAREAPrivate(ScreenPtr pScreen)
 {
-  DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-  if (!pDRIPriv) return 0;
-  return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    if (!pDRIPriv)
+        return 0;
+   return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
 }
 
 drmContext
 DRIGetContext(ScreenPtr pScreen)
 {
-  DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-  if (!pDRIPriv) return 0;
-  return pDRIPriv->myContext;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    if (!pDRIPriv)
+        return 0;
+    return pDRIPriv->myContext;
 }
-  
+
 /* This lets get at the unwrapped functions so that they can correctly
  * call the lowerlevel functions, and choose whether they will be
- * called at every level of recursion (eg in validatetree).  
+ * called at every level of recursion (eg in validatetree).
  */
 DRIWrappedFuncsRec *
 DRIGetWrappedFuncs(ScreenPtr pScreen)
 {
-   return &(DRI_SCREEN_PRIV(pScreen)->wrap);
+    return &(DRI_SCREEN_PRIV(pScreen)->wrap);
 }
 
 void
@@ -1693,9 +1699,9 @@ DRIQueryVersion(int *majorVersion,
                 int *minorVersion,
                 int *patchVersion)
 {
-   *majorVersion = XF86DRI_MAJOR_VERSION;
-   *minorVersion = XF86DRI_MINOR_VERSION;
-   *patchVersion = XF86DRI_PATCH_VERSION;
+    *majorVersion = XF86DRI_MAJOR_VERSION;
+    *minorVersion = XF86DRI_MINOR_VERSION;
+    *patchVersion = XF86DRI_PATCH_VERSION;
 }
 
 static void
@@ -1767,7 +1773,7 @@ DRIOpenFullScreen(ScreenPtr pScreen, DrawablePtr pDrawable)
     ScrnInfoPtr        pScrn       = xf86Screens[pScreen->myNum];
     WindowPtr	       pWin        = (WindowPtr)pDrawable;
     XF86DRIClipRectPtr pClipRects  = (void *)REGION_RECTS(&pWin->clipList);
-    
+
     _DRIAdjustFrame(pScrn, pDRIPriv, pScrn->frameX0, pScrn->frameY0);
 
     if (pDrawable->type != DRAWABLE_WINDOW) return FALSE;
@@ -1796,7 +1802,7 @@ DRIOpenFullScreen(ScreenPtr pScreen, DrawablePtr pDrawable)
     pScrn->vtSema        = FALSE;
     pDRIPriv->fullscreen = pDrawable;
     DRIClipNotify(pWin, 0, 0);
-		  
+
     if (pDRIPriv->pDriverInfo->OpenFullScreen)
 	pDRIPriv->pDriverInfo->OpenFullScreen(pScreen);
 
@@ -1827,7 +1833,7 @@ _DRICloseFullScreen(pointer pResource, XID id)
     pScrn->EnableDisableFBAccess(pScreen->myNum, TRUE);
     pWin->eventMask  = mask;
     pWin->optional   = optional;
-    
+
     xf86EnableVTSwitch(TRUE);
     pDRIPriv->pSAREA->frame.fullscreen = 0;
     return TRUE;
diff --git a/xc/programs/Xserver/GL/glx/g_disptab.c b/xc/programs/Xserver/GL/glx/g_disptab.c
index f05e213f3..52b378bd6 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab.c
+++ b/xc/programs/Xserver/GL/glx/g_disptab.c
@@ -1,22 +1,31 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.2 1999/06/14 07:31:22 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #include "glxserver.h"
@@ -166,6 +175,23 @@ __GLXdispatchSingleProcPtr __glXSingleTable[] = {
 	__glXDisp_IsEnabled,
 	__glXDisp_IsList,
 	__glXDisp_Flush,
+	__glXDisp_AreTexturesResident,
+	__glXDisp_DeleteTextures,
+	__glXDisp_GenTextures,
+	__glXDisp_IsTexture,
+	__glXDisp_GetColorTable,
+	__glXDisp_GetColorTableParameterfv,
+	__glXDisp_GetColorTableParameteriv,
+	__glXDisp_GetConvolutionFilter,
+	__glXDisp_GetConvolutionParameterfv,
+	__glXDisp_GetConvolutionParameteriv,
+	__glXDisp_GetSeparableFilter,
+	__glXDisp_GetHistogram,
+	__glXDisp_GetHistogramParameterfv,
+	__glXDisp_GetHistogramParameteriv,
+	__glXDisp_GetMinmax,
+	__glXDisp_GetMinmaxParameterfv,
+	__glXDisp_GetMinmaxParameteriv,
 };
 
 __GLXdispatchRenderProcPtr __glXRenderTable[] = {
@@ -361,9 +387,28 @@ __GLXdispatchRenderProcPtr __glXRenderTable[] = {
 	__glXDisp_Translated,
 	__glXDisp_Translatef,
 	__glXDisp_Viewport,
-	__glXNoSuchRenderOpcode,
-	__glXNoSuchRenderOpcode,
+	__glXDisp_PolygonOffset,
+	__glXDisp_DrawArrays,
 	__glXDisp_Indexubv,
+	__glXDisp_ColorSubTable,
+	__glXDisp_CopyColorSubTable,
+	__glXDisp_ActiveTextureARB,
+	__glXDisp_MultiTexCoord1dvARB,
+	__glXDisp_MultiTexCoord1fvARB,
+	__glXDisp_MultiTexCoord1ivARB,
+	__glXDisp_MultiTexCoord1svARB,
+	__glXDisp_MultiTexCoord2dvARB,
+	__glXDisp_MultiTexCoord2fvARB,
+	__glXDisp_MultiTexCoord2ivARB,
+	__glXDisp_MultiTexCoord2svARB,
+	__glXDisp_MultiTexCoord3dvARB,
+	__glXDisp_MultiTexCoord3fvARB,
+	__glXDisp_MultiTexCoord3ivARB,
+	__glXDisp_MultiTexCoord3svARB,
+	__glXDisp_MultiTexCoord4dvARB,
+	__glXDisp_MultiTexCoord4fvARB,
+	__glXDisp_MultiTexCoord4ivARB,
+	__glXDisp_MultiTexCoord4svARB,
 };
 
 __GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
@@ -510,6 +555,23 @@ __GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
 	__glXDispSwap_IsEnabled,
 	__glXDispSwap_IsList,
 	__glXDispSwap_Flush,
+	__glXDispSwap_AreTexturesResident,
+	__glXDispSwap_DeleteTextures,
+	__glXDispSwap_GenTextures,
+	__glXDispSwap_IsTexture,
+	__glXDispSwap_GetColorTable,
+	__glXDispSwap_GetColorTableParameterfv,
+	__glXDispSwap_GetColorTableParameteriv,
+	__glXDispSwap_GetConvolutionFilter,
+	__glXDispSwap_GetConvolutionParameterfv,
+	__glXDispSwap_GetConvolutionParameteriv,
+	__glXDispSwap_GetSeparableFilter,
+	__glXDispSwap_GetHistogram,
+	__glXDispSwap_GetHistogramParameterfv,
+	__glXDispSwap_GetHistogramParameteriv,
+	__glXDispSwap_GetMinmax,
+	__glXDispSwap_GetMinmaxParameterfv,
+	__glXDispSwap_GetMinmaxParameteriv,
 };
 
 __GLXdispatchRenderProcPtr __glXSwapRenderTable[] = {
@@ -705,7 +767,26 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable[] = {
 	__glXDispSwap_Translated,
 	__glXDispSwap_Translatef,
 	__glXDispSwap_Viewport,
-	__glXNoSuchRenderOpcode,
-	__glXNoSuchRenderOpcode,
+	__glXDispSwap_PolygonOffset,
+	__glXDispSwap_DrawArrays,
 	__glXDispSwap_Indexubv,
+	__glXDispSwap_ColorSubTable,
+	__glXDispSwap_CopyColorSubTable,
+	__glXDispSwap_ActiveTextureARB,
+	__glXDispSwap_MultiTexCoord1dvARB,
+	__glXDispSwap_MultiTexCoord1fvARB,
+	__glXDispSwap_MultiTexCoord1ivARB,
+	__glXDispSwap_MultiTexCoord1svARB,
+	__glXDispSwap_MultiTexCoord2dvARB,
+	__glXDispSwap_MultiTexCoord2fvARB,
+	__glXDispSwap_MultiTexCoord2ivARB,
+	__glXDispSwap_MultiTexCoord2svARB,
+	__glXDispSwap_MultiTexCoord3dvARB,
+	__glXDispSwap_MultiTexCoord3fvARB,
+	__glXDispSwap_MultiTexCoord3ivARB,
+	__glXDispSwap_MultiTexCoord3svARB,
+	__glXDispSwap_MultiTexCoord4dvARB,
+	__glXDispSwap_MultiTexCoord4fvARB,
+	__glXDispSwap_MultiTexCoord4ivARB,
+	__glXDispSwap_MultiTexCoord4svARB,
 };
diff --git a/xc/programs/Xserver/GL/glx/g_disptab.h b/xc/programs/Xserver/GL/glx/g_disptab.h
index 247b27ea9..56d26a1f7 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab.h
+++ b/xc/programs/Xserver/GL/glx/g_disptab.h
@@ -1,24 +1,33 @@
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_h_
 #define _GLX_g_disptab_h_
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.2 1999/06/14 07:31:22 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 extern int __glXRender(__GLXclientState*, GLbyte*);
@@ -83,6 +92,23 @@ extern int __glXDisp_GetTexLevelParameteriv(__GLXclientState*, GLbyte*);
 extern int __glXDisp_IsEnabled(__GLXclientState*, GLbyte*);
 extern int __glXDisp_IsList(__GLXclientState*, GLbyte*);
 extern int __glXDisp_Flush(__GLXclientState*, GLbyte*);
+extern int __glXDisp_AreTexturesResident(__GLXclientState*, GLbyte*);
+extern int __glXDisp_DeleteTextures(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GenTextures(__GLXclientState*, GLbyte*);
+extern int __glXDisp_IsTexture(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetColorTable(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetColorTableParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetColorTableParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetConvolutionFilter(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetConvolutionParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetConvolutionParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetSeparableFilter(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetHistogram(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetHistogramParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetHistogramParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetMinmax(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetMinmaxParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GetMinmaxParameteriv(__GLXclientState*, GLbyte*);
 
 extern void __glXDisp_CallList(GLbyte*);
 extern void __glXDisp_CallLists(GLbyte*);
@@ -274,7 +300,28 @@ extern void __glXDisp_Scalef(GLbyte*);
 extern void __glXDisp_Translated(GLbyte*);
 extern void __glXDisp_Translatef(GLbyte*);
 extern void __glXDisp_Viewport(GLbyte*);
+extern void __glXDisp_PolygonOffset(GLbyte*);
+extern void __glXDisp_DrawArrays(GLbyte*);
 extern void __glXDisp_Indexubv(GLbyte*);
+extern void __glXDisp_ColorSubTable(GLbyte*);
+extern void __glXDisp_CopyColorSubTable(GLbyte*);
+extern void __glXDisp_ActiveTextureARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord1dvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord1fvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord1ivARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord1svARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord2dvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord2fvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord2ivARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord2svARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord3dvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord3fvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord3ivARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord3svARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord4dvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord4fvARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord4ivARB(GLbyte*);
+extern void __glXDisp_MultiTexCoord4svARB(GLbyte*);
 
 extern int __glXSwapRender(__GLXclientState*, GLbyte*);
 extern int __glXSwapRenderLarge(__GLXclientState*, GLbyte*);
@@ -338,6 +385,23 @@ extern int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState*, GLbyte*);
 extern int __glXDispSwap_IsEnabled(__GLXclientState*, GLbyte*);
 extern int __glXDispSwap_IsList(__GLXclientState*, GLbyte*);
 extern int __glXDispSwap_Flush(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_AreTexturesResident(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_DeleteTextures(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GenTextures(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_IsTexture(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetColorTable(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetColorTableParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetColorTableParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetConvolutionFilter(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetSeparableFilter(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetHistogram(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetHistogramParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetHistogramParameteriv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetMinmax(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState*, GLbyte*);
 
 extern void __glXDispSwap_CallList(GLbyte*);
 extern void __glXDispSwap_CallLists(GLbyte*);
@@ -529,16 +593,37 @@ extern void __glXDispSwap_Scalef(GLbyte*);
 extern void __glXDispSwap_Translated(GLbyte*);
 extern void __glXDispSwap_Translatef(GLbyte*);
 extern void __glXDispSwap_Viewport(GLbyte*);
+extern void __glXDispSwap_PolygonOffset(GLbyte*);
+extern void __glXDispSwap_DrawArrays(GLbyte*);
 extern void __glXDispSwap_Indexubv(GLbyte*);
+extern void __glXDispSwap_ColorSubTable(GLbyte*);
+extern void __glXDispSwap_CopyColorSubTable(GLbyte*);
+extern void __glXDispSwap_ActiveTextureARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord1dvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord1fvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord1ivARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord1svARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord2dvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord2fvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord2ivARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord2svARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord3dvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord3fvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord3ivARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord3svARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord4dvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord4fvARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord4ivARB(GLbyte*);
+extern void __glXDispSwap_MultiTexCoord4svARB(GLbyte*);
 
 #define __GLX_MIN_GLXCMD_OPCODE 1
 #define __GLX_MAX_GLXCMD_OPCODE 20
 #define __GLX_MIN_RENDER_OPCODE 1
-#define __GLX_MAX_RENDER_OPCODE 194
+#define __GLX_MAX_RENDER_OPCODE 213
 #define __GLX_MIN_SINGLE_OPCODE 1
-#define __GLX_MAX_SINGLE_OPCODE 142
-#define __GLX_SINGLE_TABLE_SIZE 143
-#define __GLX_RENDER_TABLE_SIZE 195
+#define __GLX_MAX_SINGLE_OPCODE 159
+#define __GLX_SINGLE_TABLE_SIZE 160
+#define __GLX_RENDER_TABLE_SIZE 214
 extern __GLXdispatchRenderProcPtr __glXRenderTable[__GLX_RENDER_TABLE_SIZE];
 extern __GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE];
 extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE];
diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
index 1ac56e678..5923aa225 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
+++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
@@ -1,31 +1,1052 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.2 1999/06/14 07:31:22 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab_EXT.h"
 __GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
-	__glXDisp_PolygonOffset,
-	__glXDisp_TexSubImage1D,
-	__glXDisp_TexSubImage2D,
+	__glXDisp_ColorTable,
+	__glXDisp_ColorTableParameterfv,
+	__glXDisp_ColorTableParameteriv,
+	__glXDisp_CopyColorTable,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
@@ -41,26 +1062,2073 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
-	__glXDisp_DrawArrays,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXDisp_BlendColor,
+	__glXDisp_BlendEquation,
+	__glXNoSuchRenderOpcode,
+	__glXDisp_TexSubImage1D,
+	__glXDisp_TexSubImage2D,
+	__glXDisp_ConvolutionFilter1D,
+	__glXDisp_ConvolutionFilter2D,
+	__glXDisp_ConvolutionParameterf,
+	__glXDisp_ConvolutionParameterfv,
+	__glXDisp_ConvolutionParameteri,
+	__glXDisp_ConvolutionParameteriv,
+	__glXDisp_CopyConvolutionFilter1D,
+	__glXDisp_CopyConvolutionFilter2D,
+	__glXDisp_SeparableFilter2D,
+	__glXDisp_Histogram,
+	__glXDisp_Minmax,
+	__glXDisp_ResetHistogram,
+	__glXDisp_ResetMinmax,
+	__glXDisp_TexImage3D,
+	__glXDisp_TexSubImage3D,
+	__glXDisp_DrawArraysEXT,
 	__glXDisp_BindTexture,
 	__glXDisp_PrioritizeTextures,
 	__glXDisp_CopyTexImage1D,
 	__glXDisp_CopyTexImage2D,
 	__glXDisp_CopyTexSubImage1D,
 	__glXDisp_CopyTexSubImage2D,
+	__glXDisp_CopyTexSubImage3D,
 };
 __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[] = {
-	__glXDisp_AreTexturesResident,
-	__glXDisp_DeleteTextures,
-	__glXDisp_GenTextures,
-	__glXDisp_IsTexture,
+	__glXDisp_AreTexturesResidentEXT,
+	__glXDisp_DeleteTexturesEXT,
+	__glXDisp_GenTexturesEXT,
+	__glXDisp_IsTextureEXT,
 };
 
 
 __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[] = {
-	__glXDispSwap_PolygonOffset,
-	__glXDispSwap_TexSubImage1D,
-	__glXDispSwap_TexSubImage2D,
+	__glXDispSwap_ColorTable,
+	__glXDispSwap_ColorTableParameterfv,
+	__glXDispSwap_ColorTableParameteriv,
+	__glXDispSwap_CopyColorTable,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
@@ -76,18 +3144,1051 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[] = {
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
-	__glXDispSwap_DrawArrays,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXDispSwap_BlendColor,
+	__glXDispSwap_BlendEquation,
+	__glXNoSuchRenderOpcode,
+	__glXDispSwap_TexSubImage1D,
+	__glXDispSwap_TexSubImage2D,
+	__glXDispSwap_ConvolutionFilter1D,
+	__glXDispSwap_ConvolutionFilter2D,
+	__glXDispSwap_ConvolutionParameterf,
+	__glXDispSwap_ConvolutionParameterfv,
+	__glXDispSwap_ConvolutionParameteri,
+	__glXDispSwap_ConvolutionParameteriv,
+	__glXDispSwap_CopyConvolutionFilter1D,
+	__glXDispSwap_CopyConvolutionFilter2D,
+	__glXDispSwap_SeparableFilter2D,
+	__glXDispSwap_Histogram,
+	__glXDispSwap_Minmax,
+	__glXDispSwap_ResetHistogram,
+	__glXDispSwap_ResetMinmax,
+	__glXDispSwap_TexImage3D,
+	__glXDispSwap_TexSubImage3D,
+	__glXDispSwap_DrawArraysEXT,
 	__glXDispSwap_BindTexture,
 	__glXDispSwap_PrioritizeTextures,
 	__glXDispSwap_CopyTexImage1D,
 	__glXDispSwap_CopyTexImage2D,
 	__glXDispSwap_CopyTexSubImage1D,
 	__glXDispSwap_CopyTexSubImage2D,
+	__glXDispSwap_CopyTexSubImage3D,
 };
 __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[] = {
-	__glXDispSwap_AreTexturesResident,
-	__glXDispSwap_DeleteTextures,
-	__glXDispSwap_GenTextures,
-	__glXDispSwap_IsTexture,
+	__glXDispSwap_AreTexturesResidentEXT,
+	__glXDispSwap_DeleteTexturesEXT,
+	__glXDispSwap_GenTexturesEXT,
+	__glXDispSwap_IsTextureEXT,
 };
 
diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
index 59c7e3024..f28d3b9ff 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
+++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
@@ -1,64 +1,115 @@
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_EXT_h_
 #define _GLX_g_disptab_EXT_h_
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.2 1999/06/14 07:31:23 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
-extern int __glXDisp_AreTexturesResident(__GLXclientState*, GLbyte*);
-extern int __glXDisp_DeleteTextures(__GLXclientState*, GLbyte*);
-extern int __glXDisp_GenTextures(__GLXclientState*, GLbyte*);
-extern int __glXDisp_IsTexture(__GLXclientState*, GLbyte*);
+extern int __glXDisp_AreTexturesResidentEXT(__GLXclientState*, GLbyte*);
+extern int __glXDisp_DeleteTexturesEXT(__GLXclientState*, GLbyte*);
+extern int __glXDisp_GenTexturesEXT(__GLXclientState*, GLbyte*);
+extern int __glXDisp_IsTextureEXT(__GLXclientState*, GLbyte*);
 
-extern void __glXDisp_PolygonOffset(GLbyte*);
+extern void __glXDisp_ColorTable(GLbyte*);
+extern void __glXDisp_ColorTableParameterfv(GLbyte*);
+extern void __glXDisp_ColorTableParameteriv(GLbyte*);
+extern void __glXDisp_CopyColorTable(GLbyte*);
+extern void __glXDisp_BlendColor(GLbyte*);
+extern void __glXDisp_BlendEquation(GLbyte*);
 extern void __glXDisp_TexSubImage1D(GLbyte*);
 extern void __glXDisp_TexSubImage2D(GLbyte*);
-extern void __glXDisp_DrawArrays(GLbyte*);
+extern void __glXDisp_ConvolutionFilter1D(GLbyte*);
+extern void __glXDisp_ConvolutionFilter2D(GLbyte*);
+extern void __glXDisp_ConvolutionParameterf(GLbyte*);
+extern void __glXDisp_ConvolutionParameterfv(GLbyte*);
+extern void __glXDisp_ConvolutionParameteri(GLbyte*);
+extern void __glXDisp_ConvolutionParameteriv(GLbyte*);
+extern void __glXDisp_CopyConvolutionFilter1D(GLbyte*);
+extern void __glXDisp_CopyConvolutionFilter2D(GLbyte*);
+extern void __glXDisp_SeparableFilter2D(GLbyte*);
+extern void __glXDisp_Histogram(GLbyte*);
+extern void __glXDisp_Minmax(GLbyte*);
+extern void __glXDisp_ResetHistogram(GLbyte*);
+extern void __glXDisp_ResetMinmax(GLbyte*);
+extern void __glXDisp_TexImage3D(GLbyte*);
+extern void __glXDisp_TexSubImage3D(GLbyte*);
+extern void __glXDisp_DrawArraysEXT(GLbyte*);
 extern void __glXDisp_BindTexture(GLbyte*);
 extern void __glXDisp_PrioritizeTextures(GLbyte*);
 extern void __glXDisp_CopyTexImage1D(GLbyte*);
 extern void __glXDisp_CopyTexImage2D(GLbyte*);
 extern void __glXDisp_CopyTexSubImage1D(GLbyte*);
 extern void __glXDisp_CopyTexSubImage2D(GLbyte*);
+extern void __glXDisp_CopyTexSubImage3D(GLbyte*);
 
-extern int __glXDispSwap_AreTexturesResident(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_DeleteTextures(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_GenTextures(__GLXclientState*, GLbyte*);
-extern int __glXDispSwap_IsTexture(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_DeleteTexturesEXT(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_GenTexturesEXT(__GLXclientState*, GLbyte*);
+extern int __glXDispSwap_IsTextureEXT(__GLXclientState*, GLbyte*);
 
-extern void __glXDispSwap_PolygonOffset(GLbyte*);
+extern void __glXDispSwap_ColorTable(GLbyte*);
+extern void __glXDispSwap_ColorTableParameterfv(GLbyte*);
+extern void __glXDispSwap_ColorTableParameteriv(GLbyte*);
+extern void __glXDispSwap_CopyColorTable(GLbyte*);
+extern void __glXDispSwap_BlendColor(GLbyte*);
+extern void __glXDispSwap_BlendEquation(GLbyte*);
 extern void __glXDispSwap_TexSubImage1D(GLbyte*);
 extern void __glXDispSwap_TexSubImage2D(GLbyte*);
-extern void __glXDispSwap_DrawArrays(GLbyte*);
+extern void __glXDispSwap_ConvolutionFilter1D(GLbyte*);
+extern void __glXDispSwap_ConvolutionFilter2D(GLbyte*);
+extern void __glXDispSwap_ConvolutionParameterf(GLbyte*);
+extern void __glXDispSwap_ConvolutionParameterfv(GLbyte*);
+extern void __glXDispSwap_ConvolutionParameteri(GLbyte*);
+extern void __glXDispSwap_ConvolutionParameteriv(GLbyte*);
+extern void __glXDispSwap_CopyConvolutionFilter1D(GLbyte*);
+extern void __glXDispSwap_CopyConvolutionFilter2D(GLbyte*);
+extern void __glXDispSwap_SeparableFilter2D(GLbyte*);
+extern void __glXDispSwap_Histogram(GLbyte*);
+extern void __glXDispSwap_Minmax(GLbyte*);
+extern void __glXDispSwap_ResetHistogram(GLbyte*);
+extern void __glXDispSwap_ResetMinmax(GLbyte*);
+extern void __glXDispSwap_TexImage3D(GLbyte*);
+extern void __glXDispSwap_TexSubImage3D(GLbyte*);
+extern void __glXDispSwap_DrawArraysEXT(GLbyte*);
 extern void __glXDispSwap_BindTexture(GLbyte*);
 extern void __glXDispSwap_PrioritizeTextures(GLbyte*);
 extern void __glXDispSwap_CopyTexImage1D(GLbyte*);
 extern void __glXDispSwap_CopyTexImage2D(GLbyte*);
 extern void __glXDispSwap_CopyTexSubImage1D(GLbyte*);
 extern void __glXDispSwap_CopyTexSubImage2D(GLbyte*);
+extern void __glXDispSwap_CopyTexSubImage3D(GLbyte*);
 
-#define __GLX_MIN_RENDER_OPCODE_EXT 4098
-#define __GLX_MAX_RENDER_OPCODE_EXT 4122
+#define __GLX_MIN_RENDER_OPCODE_EXT 2053
+#define __GLX_MAX_RENDER_OPCODE_EXT 4123
 #define __GLX_MIN_VENDPRIV_OPCODE_EXT 11
 #define __GLX_MAX_VENDPRIV_OPCODE_EXT 14
 #define __GLX_VENDPRIV_TABLE_SIZE_EXT 4
-#define __GLX_RENDER_TABLE_SIZE_EXT 25
+#define __GLX_RENDER_TABLE_SIZE_EXT 2071
 extern __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_RENDER_TABLE_SIZE_EXT];
 extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_VENDPRIV_TABLE_SIZE_EXT];
 extern __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_RENDER_TABLE_SIZE_EXT];
diff --git a/xc/programs/Xserver/GL/glx/g_render.c b/xc/programs/Xserver/GL/glx/g_render.c
index d8214d02a..7948fab82 100644
--- a/xc/programs/Xserver/GL/glx/g_render.c
+++ b/xc/programs/Xserver/GL/glx/g_render.c
@@ -1,23 +1,31 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
-/* by SGI when creating the GLX sample implementation */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #define NEED_REPLIES
@@ -1739,3 +1747,330 @@ void __glXDisp_Indexubv(GLbyte *pc)
 	);
 }
 
+void __glXDisp_BlendColor(GLbyte *pc)
+{
+	glBlendColor( 
+		*(GLclampf *)(pc + 0),
+		*(GLclampf *)(pc + 4),
+		*(GLclampf *)(pc + 8),
+		*(GLclampf *)(pc + 12)
+	);
+}
+
+void __glXDisp_BlendEquation(GLbyte *pc)
+{
+	glBlendEquation( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDisp_ColorTableParameterfv(GLbyte *pc)
+{
+	glColorTableParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDisp_ColorTableParameteriv(GLbyte *pc)
+{
+	glColorTableParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDisp_CopyColorTable(GLbyte *pc)
+{
+	glCopyColorTable( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDisp_CopyColorSubTable(GLbyte *pc)
+{
+	glCopyColorSubTable( 
+		*(GLenum   *)(pc + 0),
+		*(GLsizei  *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDisp_ConvolutionParameterf(GLbyte *pc)
+{
+	glConvolutionParameterf( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDisp_ConvolutionParameterfv(GLbyte *pc)
+{
+	glConvolutionParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDisp_ConvolutionParameteri(GLbyte *pc)
+{
+	glConvolutionParameteri( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDisp_ConvolutionParameteriv(GLbyte *pc)
+{
+	glConvolutionParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDisp_CopyConvolutionFilter1D(GLbyte *pc)
+{
+	glCopyConvolutionFilter1D( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDisp_CopyConvolutionFilter2D(GLbyte *pc)
+{
+	glCopyConvolutionFilter2D( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16),
+		*(GLsizei  *)(pc + 20)
+	);
+}
+
+void __glXDisp_Histogram(GLbyte *pc)
+{
+	glHistogram( 
+		*(GLenum   *)(pc + 0),
+		*(GLsizei  *)(pc + 4),
+		*(GLenum   *)(pc + 8),
+		*(GLboolean *)(pc + 12)
+	);
+}
+
+void __glXDisp_Minmax(GLbyte *pc)
+{
+	glMinmax( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLboolean *)(pc + 8)
+	);
+}
+
+void __glXDisp_ResetHistogram(GLbyte *pc)
+{
+	glResetHistogram( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDisp_ResetMinmax(GLbyte *pc)
+{
+	glResetMinmax( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDisp_CopyTexSubImage3D(GLbyte *pc)
+{
+	glCopyTexSubImage3D( 
+		*(GLenum   *)(pc + 0),
+		*(GLint    *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLint    *)(pc + 16),
+		*(GLint    *)(pc + 20),
+		*(GLint    *)(pc + 24),
+		*(GLsizei  *)(pc + 28),
+		*(GLsizei  *)(pc + 32)
+	);
+}
+
+void __glXDisp_ActiveTextureARB(GLbyte *pc)
+{
+	glActiveTextureARB( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDisp_MultiTexCoord1dvARB(GLbyte *pc)
+{
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 12);
+	    pc -= 4;
+	}
+#endif
+	glMultiTexCoord1dvARB( 
+		*(GLenum   *)(pc + 8),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDisp_MultiTexCoord1fvARB(GLbyte *pc)
+{
+	glMultiTexCoord1fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord1ivARB(GLbyte *pc)
+{
+	glMultiTexCoord1ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord1svARB(GLbyte *pc)
+{
+	glMultiTexCoord1svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord2dvARB(GLbyte *pc)
+{
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 20);
+	    pc -= 4;
+	}
+#endif
+	glMultiTexCoord2dvARB( 
+		*(GLenum   *)(pc + 16),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDisp_MultiTexCoord2fvARB(GLbyte *pc)
+{
+	glMultiTexCoord2fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord2ivARB(GLbyte *pc)
+{
+	glMultiTexCoord2ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord2svARB(GLbyte *pc)
+{
+	glMultiTexCoord2svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord3dvARB(GLbyte *pc)
+{
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 28);
+	    pc -= 4;
+	}
+#endif
+	glMultiTexCoord3dvARB( 
+		*(GLenum   *)(pc + 24),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDisp_MultiTexCoord3fvARB(GLbyte *pc)
+{
+	glMultiTexCoord3fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord3ivARB(GLbyte *pc)
+{
+	glMultiTexCoord3ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord3svARB(GLbyte *pc)
+{
+	glMultiTexCoord3svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord4dvARB(GLbyte *pc)
+{
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 36);
+	    pc -= 4;
+	}
+#endif
+	glMultiTexCoord4dvARB( 
+		*(GLenum   *)(pc + 32),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDisp_MultiTexCoord4fvARB(GLbyte *pc)
+{
+	glMultiTexCoord4fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord4ivARB(GLbyte *pc)
+{
+	glMultiTexCoord4ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDisp_MultiTexCoord4svARB(GLbyte *pc)
+{
+	glMultiTexCoord4svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
diff --git a/xc/programs/Xserver/GL/glx/g_renderswap.c b/xc/programs/Xserver/GL/glx/g_renderswap.c
index 5b57a07a3..5673420a3 100644
--- a/xc/programs/Xserver/GL/glx/g_renderswap.c
+++ b/xc/programs/Xserver/GL/glx/g_renderswap.c
@@ -1,23 +1,31 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
-/* by SGI when creating the GLX sample implementation */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #define NEED_REPLIES
@@ -2715,3 +2723,545 @@ void __glXDispSwap_Indexubv(GLbyte *pc)
 	);
 }
 
+void __glXDispSwap_BlendColor(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_FLOAT(pc + 0);
+	__GLX_SWAP_FLOAT(pc + 4);
+	__GLX_SWAP_FLOAT(pc + 8);
+	__GLX_SWAP_FLOAT(pc + 12);
+
+	glBlendColor( 
+		*(GLclampf *)(pc + 0),
+		*(GLclampf *)(pc + 4),
+		*(GLclampf *)(pc + 8),
+		*(GLclampf *)(pc + 12)
+	);
+}
+
+void __glXDispSwap_BlendEquation(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+
+	glBlendEquation( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_ColorTableParameterfv(GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glColorTableParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+
+	glColorTableParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_ColorTableParameteriv(GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glColorTableParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+
+	glColorTableParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_CopyColorTable(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_INT(pc + 12);
+	__GLX_SWAP_INT(pc + 16);
+
+	glCopyColorTable( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDispSwap_CopyColorSubTable(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_INT(pc + 12);
+	__GLX_SWAP_INT(pc + 16);
+
+	glCopyColorSubTable( 
+		*(GLenum   *)(pc + 0),
+		*(GLsizei  *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDispSwap_ConvolutionParameterf(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_FLOAT(pc + 8);
+
+	glConvolutionParameterf( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_ConvolutionParameterfv(GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glConvolutionParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 8, compsize);
+
+	glConvolutionParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_ConvolutionParameteri(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+
+	glConvolutionParameteri( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_ConvolutionParameteriv(GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glConvolutionParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 8, compsize);
+
+	glConvolutionParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_CopyConvolutionFilter1D(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_INT(pc + 12);
+	__GLX_SWAP_INT(pc + 16);
+
+	glCopyConvolutionFilter1D( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16)
+	);
+}
+
+void __glXDispSwap_CopyConvolutionFilter2D(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_INT(pc + 12);
+	__GLX_SWAP_INT(pc + 16);
+	__GLX_SWAP_INT(pc + 20);
+
+	glCopyConvolutionFilter2D( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLsizei  *)(pc + 16),
+		*(GLsizei  *)(pc + 20)
+	);
+}
+
+void __glXDispSwap_Histogram(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+
+	glHistogram( 
+		*(GLenum   *)(pc + 0),
+		*(GLsizei  *)(pc + 4),
+		*(GLenum   *)(pc + 8),
+		*(GLboolean *)(pc + 12)
+	);
+}
+
+void __glXDispSwap_Minmax(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+
+	glMinmax( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		*(GLboolean *)(pc + 8)
+	);
+}
+
+void __glXDispSwap_ResetHistogram(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+
+	glResetHistogram( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_ResetMinmax(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+
+	glResetMinmax( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_CopyTexSubImage3D(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT(pc + 4);
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_INT(pc + 12);
+	__GLX_SWAP_INT(pc + 16);
+	__GLX_SWAP_INT(pc + 20);
+	__GLX_SWAP_INT(pc + 24);
+	__GLX_SWAP_INT(pc + 28);
+	__GLX_SWAP_INT(pc + 32);
+
+	glCopyTexSubImage3D( 
+		*(GLenum   *)(pc + 0),
+		*(GLint    *)(pc + 4),
+		*(GLint    *)(pc + 8),
+		*(GLint    *)(pc + 12),
+		*(GLint    *)(pc + 16),
+		*(GLint    *)(pc + 20),
+		*(GLint    *)(pc + 24),
+		*(GLsizei  *)(pc + 28),
+		*(GLsizei  *)(pc + 32)
+	);
+}
+
+void __glXDispSwap_ActiveTextureARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+
+	glActiveTextureARB( 
+		*(GLenum   *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 12);
+	    pc -= 4;
+	}
+#endif
+	__GLX_SWAP_INT(pc + 8);
+	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 1);
+
+	glMultiTexCoord1dvARB( 
+		*(GLenum   *)(pc + 8),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 1);
+
+	glMultiTexCoord1fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, 1);
+
+	glMultiTexCoord1ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_SHORT_ARRAY(pc + 4, 1);
+
+	glMultiTexCoord1svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 20);
+	    pc -= 4;
+	}
+#endif
+	__GLX_SWAP_INT(pc + 16);
+	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 2);
+
+	glMultiTexCoord2dvARB( 
+		*(GLenum   *)(pc + 16),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 2);
+
+	glMultiTexCoord2fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, 2);
+
+	glMultiTexCoord2ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_SHORT_ARRAY(pc + 4, 2);
+
+	glMultiTexCoord2svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 28);
+	    pc -= 4;
+	}
+#endif
+	__GLX_SWAP_INT(pc + 24);
+	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 3);
+
+	glMultiTexCoord3dvARB( 
+		*(GLenum   *)(pc + 24),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 3);
+
+	glMultiTexCoord3fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, 3);
+
+	glMultiTexCoord3ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_SHORT_ARRAY(pc + 4, 3);
+
+	glMultiTexCoord3svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+
+#ifdef __GLX_ALIGN64
+	if ((unsigned long)(pc) & 7) {
+	    __GLX_MEM_COPY(pc-4, pc, 36);
+	    pc -= 4;
+	}
+#endif
+	__GLX_SWAP_INT(pc + 32);
+	__GLX_SWAP_DOUBLE_ARRAY(pc + 0, 4);
+
+	glMultiTexCoord4dvARB( 
+		*(GLenum   *)(pc + 32),
+		(GLdouble *)(pc + 0)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_FLOAT_ARRAY(pc + 4, 4);
+
+	glMultiTexCoord4fvARB( 
+		*(GLenum   *)(pc + 0),
+		(GLfloat  *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, 4);
+
+	glMultiTexCoord4ivARB( 
+		*(GLenum   *)(pc + 0),
+		(GLint    *)(pc + 4)
+	);
+}
+
+void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
+{
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(pc + 0);
+	__GLX_SWAP_SHORT_ARRAY(pc + 4, 4);
+
+	glMultiTexCoord4svARB( 
+		*(GLenum   *)(pc + 0),
+		(GLshort  *)(pc + 4)
+	);
+}
+
diff --git a/xc/programs/Xserver/GL/glx/g_single.c b/xc/programs/Xserver/GL/glx/g_single.c
index e86d68f86..cb9f4eb33 100644
--- a/xc/programs/Xserver/GL/glx/g_single.c
+++ b/xc/programs/Xserver/GL/glx/g_single.c
@@ -1,23 +1,31 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
-/* by SGI when creating the GLX sample implementation */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #define NEED_REPLIES
@@ -431,8 +439,8 @@ int __glXDisp_GetLightiv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -445,8 +453,8 @@ int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	query = *(GLenum *)(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapdv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -477,8 +485,8 @@ int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -491,8 +499,8 @@ int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	query = *(GLenum *)(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapfv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -523,8 +531,8 @@ int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -537,8 +545,8 @@ int __glXDisp_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	query = *(GLenum *)(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapiv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -1238,11 +1246,11 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 	GLboolean answerBuffer[200];
 	char *answer;
 
-	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
 	if (!cx) {
 		return error;
 	}
-	pc += __GLX_VENDPRIV_HDR_SIZE;
+	pc += __GLX_SINGLE_HDR_SIZE;
 	n = *(GLsizei *)(pc + 0);
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
@@ -1266,11 +1274,11 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 	ClientPtr client = cl->client;
 	int error;
 
-	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
 	if (!cx) {
 		return error;
 	}
-	pc += __GLX_VENDPRIV_HDR_SIZE;
+	pc += __GLX_SINGLE_HDR_SIZE;
 	n = *(GLsizei *)(pc + 0);
 
 	glDeleteTextures( 
@@ -1289,11 +1297,11 @@ int __glXDisp_GenTextures(__GLXclientState *cl, GLbyte *pc)
 	GLuint answerBuffer[200];
 	char *answer;
 
-	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
 	if (!cx) {
 		return error;
 	}
-	pc += __GLX_VENDPRIV_HDR_SIZE;
+	pc += __GLX_SINGLE_HDR_SIZE;
 	n = *(GLsizei *)(pc + 0);
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
@@ -1314,14 +1322,468 @@ int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc)
 	ClientPtr client = cl->client;
 	int error;
 
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+
+	retval =
+	glIsTexture( 
+		*(GLuint   *)(pc + 0)
+	);
+	__GLX_PUT_RETVAL(retval);
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+	return Success;
+}
+
+int __glXDisp_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetColorTableParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetColorTableParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetColorTableParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetColorTableParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetConvolutionParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetConvolutionParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetConvolutionParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetConvolutionParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetHistogramParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetHistogramParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetHistogramParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetHistogramParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetMinmaxParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetMinmaxParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetMinmaxParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetMinmaxParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_PUT_SIZE(1);
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	GLboolean retval;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLboolean answerBuffer[200];
+	char *answer;
+
 	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
 	if (!cx) {
 		return error;
 	}
 	pc += __GLX_VENDPRIV_HDR_SIZE;
+	n = *(GLsizei *)(pc + 0);
 
+	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
 	retval =
-	glIsTexture( 
+	glAreTexturesResidentEXT( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *)(pc + 4),
+		(GLboolean *) answer
+	);
+	__GLX_PUT_RETVAL(retval);
+	__GLX_BEGIN_REPLY(n);
+	__GLX_SEND_HEADER();
+	__GLX_SEND_BYTE_ARRAY(n);
+	return Success;
+}
+
+int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_VENDPRIV_HDR_SIZE;
+	n = *(GLsizei *)(pc + 0);
+
+	glDeleteTexturesEXT( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *)(pc + 4)
+	);
+	return Success;
+}
+
+int __glXDisp_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLuint answerBuffer[200];
+	char *answer;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_VENDPRIV_HDR_SIZE;
+	n = *(GLsizei *)(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
+	glGenTexturesEXT( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *) answer
+	);
+	__GLX_BEGIN_REPLY(n*4);
+	__GLX_SEND_HEADER();
+	__GLX_SEND_INT_ARRAY(n);
+	return Success;
+}
+
+int __glXDisp_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
+{
+	GLboolean retval;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+
+	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_VENDPRIV_HDR_SIZE;
+
+	retval =
+	glIsTextureEXT( 
 		*(GLuint   *)(pc + 0)
 	);
 	__GLX_PUT_RETVAL(retval);
diff --git a/xc/programs/Xserver/GL/glx/g_singleswap.c b/xc/programs/Xserver/GL/glx/g_singleswap.c
index 98f8631a6..4b88c4ee9 100644
--- a/xc/programs/Xserver/GL/glx/g_singleswap.c
+++ b/xc/programs/Xserver/GL/glx/g_singleswap.c
@@ -1,23 +1,31 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.3 1999/06/14 07:31:24 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
-/* by SGI when creating the GLX sample implementation */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
 */
 
 #define NEED_REPLIES
@@ -513,8 +521,8 @@ int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -529,10 +537,10 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	__GLX_SWAP_INT(pc + 4);
 	__GLX_SWAP_INT(pc + 0);
-	query = *(GLenum *)(pc + 4);
+	__GLX_SWAP_INT(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapdv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -569,8 +577,8 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -585,10 +593,10 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	__GLX_SWAP_INT(pc + 4);
 	__GLX_SWAP_INT(pc + 0);
-	query = *(GLenum *)(pc + 4);
+	__GLX_SWAP_INT(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapfv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -625,8 +633,8 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 {
-	GLenum query;
 	GLenum target;
+	GLenum query;
 	GLint compsize;
 	__GLXcontext *cx;
 	ClientPtr client = cl->client;
@@ -641,10 +649,10 @@ int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	__GLX_SWAP_INT(pc + 4);
 	__GLX_SWAP_INT(pc + 0);
-	query = *(GLenum *)(pc + 4);
+	__GLX_SWAP_INT(pc + 4);
 	target = *(GLenum *)(pc + 0);
+	query = *(GLenum *)(pc + 4);
 	compsize = __glGetMapiv_size(target,query);
 	if (compsize < 0) compsize = 0;
 
@@ -1500,6 +1508,560 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 	char *answer;
 	__GLX_DECLARE_SWAP_VARIABLES;
 
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 0);
+	n = *(GLsizei *)(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, n);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
+	retval =
+	glAreTexturesResident( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *)(pc + 4),
+		(GLboolean *) answer
+	);
+	__GLX_PUT_RETVAL(retval);
+	__GLX_SWAP_REPLY_RETVAL();
+	__GLX_BEGIN_REPLY(n);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SEND_HEADER();
+	__GLX_SEND_BYTE_ARRAY(n);
+	return Success;
+}
+
+int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 0);
+	n = *(GLsizei *)(pc + 0);
+	__GLX_SWAP_INT_ARRAY(pc + 4, n);
+
+	glDeleteTextures( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *)(pc + 4)
+	);
+	return Success;
+}
+
+int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLuint answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 0);
+	n = *(GLsizei *)(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
+	glGenTextures( 
+		*(GLsizei  *)(pc + 0),
+		(GLuint   *) answer
+	);
+	__GLX_SWAP_INT_ARRAY(answer, n);
+	__GLX_BEGIN_REPLY(n*4);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SEND_HEADER();
+	__GLX_SEND_INT_ARRAY(n);
+	return Success;
+}
+
+int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
+{
+	GLboolean retval;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 0);
+
+	retval =
+	glIsTexture( 
+		*(GLuint   *)(pc + 0)
+	);
+	__GLX_PUT_RETVAL(retval);
+	__GLX_SWAP_REPLY_RETVAL();
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SEND_HEADER();
+	return Success;
+}
+
+int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetColorTableParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetColorTableParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	__GLX_SWAP_FLOAT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetColorTableParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetColorTableParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	__GLX_SWAP_INT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetConvolutionParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetConvolutionParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	__GLX_SWAP_FLOAT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetConvolutionParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetConvolutionParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	__GLX_SWAP_INT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetHistogramParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetHistogramParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	__GLX_SWAP_FLOAT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetHistogramParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetHistogramParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	__GLX_SWAP_INT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLfloat answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetMinmaxParameterfv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetMinmaxParameterfv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLfloat  *) answer
+	);
+	__GLX_SWAP_FLOAT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_FLOAT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_FLOAT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
+{
+	GLenum pname;
+	GLint compsize;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLint answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
+	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+	if (!cx) {
+		return error;
+	}
+	pc += __GLX_SINGLE_HDR_SIZE;
+	__GLX_SWAP_INT(pc + 4);
+	pname = *(GLenum *)(pc + 4);
+	compsize = __glGetMinmaxParameteriv_size(pname);
+	if (compsize < 0) compsize = 0;
+	__GLX_SWAP_INT(pc + 0);
+
+	__GLX_GET_ANSWER_BUFFER(answer,cl,compsize*4,4);
+	__glXClearErrorOccured();
+	glGetMinmaxParameteriv( 
+		*(GLenum   *)(pc + 0),
+		*(GLenum   *)(pc + 4),
+		(GLint    *) answer
+	);
+	__GLX_SWAP_INT_ARRAY(answer, compsize);
+	if (__glXErrorOccured()) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(0);
+	    __GLX_SEND_HEADER();
+	} else if (compsize == 1) {
+	    __GLX_BEGIN_REPLY(0);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(1);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_PUT_INT();
+	    __GLX_SEND_HEADER();
+	} else {
+	    __GLX_BEGIN_REPLY(compsize*4);
+	    __GLX_SWAP_REPLY_HEADER();
+	    __GLX_PUT_SIZE(compsize);
+	    __GLX_SWAP_REPLY_SIZE();
+	    __GLX_SEND_HEADER();
+	    __GLX_SEND_INT_ARRAY(compsize);
+	}
+	return Success;
+}
+
+int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
+{
+	GLsizei n;
+	GLboolean retval;
+	__GLXcontext *cx;
+	ClientPtr client = cl->client;
+	int error;
+	GLboolean answerBuffer[200];
+	char *answer;
+	__GLX_DECLARE_SWAP_VARIABLES;
+
 	__GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag);
 	cx = __glXForceCurrent(cl, __GLX_GET_VENDPRIV_CONTEXT_TAG(pc), &error);
 	if (!cx) {
@@ -1512,7 +2074,7 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n,1);
 	retval =
-	glAreTexturesResident( 
+	glAreTexturesResidentEXT( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *)(pc + 4),
 		(GLboolean *) answer
@@ -1526,7 +2088,7 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 	return Success;
 }
 
-int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
 	GLsizei n;
 	__GLXcontext *cx;
@@ -1544,14 +2106,14 @@ int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 	n = *(GLsizei *)(pc + 0);
 	__GLX_SWAP_INT_ARRAY(pc + 4, n);
 
-	glDeleteTextures( 
+	glDeleteTexturesEXT( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *)(pc + 4)
 	);
 	return Success;
 }
 
-int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
 	GLsizei n;
 	__GLXcontext *cx;
@@ -1571,7 +2133,7 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
 	n = *(GLsizei *)(pc + 0);
 
 	__GLX_GET_ANSWER_BUFFER(answer,cl,n*4,4);
-	glGenTextures( 
+	glGenTexturesEXT( 
 		*(GLsizei  *)(pc + 0),
 		(GLuint   *) answer
 	);
@@ -1583,7 +2145,7 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
 	return Success;
 }
 
-int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
+int __glXDispSwap_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
 {
 	GLboolean retval;
 	__GLXcontext *cx;
@@ -1600,7 +2162,7 @@ int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
 	__GLX_SWAP_INT(pc + 0);
 
 	retval =
-	glIsTexture( 
+	glIsTextureEXT( 
 		*(GLuint   *)(pc + 0)
 	);
 	__GLX_PUT_RETVAL(retval);
diff --git a/xc/programs/Xserver/GL/glx/global.c b/xc/programs/Xserver/GL/glx/global.c
index 5a7ae7ff9..f56c52eae 100644
--- a/xc/programs/Xserver/GL/glx/global.c
+++ b/xc/programs/Xserver/GL/glx/global.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.2 1999/06/14 07:31:24 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/global.c,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/glxbuf.c b/xc/programs/Xserver/GL/glx/glxbuf.c
index 6c42e588a..87a4c7b45 100644
--- a/xc/programs/Xserver/GL/glx/glxbuf.c
+++ b/xc/programs/Xserver/GL/glx/glxbuf.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxbuf.c,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 #include "glxserver.h"
@@ -65,7 +80,7 @@ __glXFBInitDrawable(__GLXdrawablePrivate *glxPriv, __GLcontextModes *modes)
 	}
     }
 
-#if defined(__GL_MAX_AUXBUFFERS) && (__GL_MAX_AUXBUFFERS > 0)
+#if __GL_MAX_AUXBUFFERS > 0
     if (modes->maxAuxBuffers > 0) {
 	GLint i;
 
@@ -134,7 +149,7 @@ __glXPixInitDrawable(__GLXdrawablePrivate *glxPriv, __GLcontextModes *modes)
 	}
     }
 
-#if defined(__GL_MAX_AUXBUFFERS) && (__GL_MAX_AUXBUFFERS > 0)
+#if __GL_MAX_AUXBUFFERS > 0
     if (modes->maxAuxBuffers > 0) {
 	GLint i;
 
@@ -189,7 +204,7 @@ __glXResizeBuffers(__GLdrawablePrivate *glPriv,
 	__GLX_SET_ACCEL_BUFFER_MASK(__GL_BACK_BUFFER_MASK);
     }
 
-#if defined(__GL_MAX_AUXBUFFERS) && (__GL_MAX_AUXBUFFERS > 0)
+#if __GL_MAX_AUXBUFFERS > 0
     if (modes->maxAuxBuffers > 0) {
 	GLint i;
 
@@ -250,7 +265,7 @@ __glXFreeBuffers(__GLXdrawablePrivate *glxPriv)
 	(*glPriv->backBuffer.free)(&glPriv->backBuffer, glPriv);
     }
 
-#if defined(__GL_MAX_AUXBUFFERS) && (__GL_MAX_AUXBUFFERS > 0)
+#if __GL_MAX_AUXBUFFERS > 0
     if (modes->maxAuxBuffers > 0) {
 	GLint i;
 
diff --git a/xc/programs/Xserver/GL/glx/glxbuf.h b/xc/programs/Xserver/GL/glx/glxbuf.h
index 05cea4a44..e81aebcf9 100644
--- a/xc/programs/Xserver/GL/glx/glxbuf.h
+++ b/xc/programs/Xserver/GL/glx/glxbuf.h
@@ -1,26 +1,41 @@
 #ifndef _glxbuf_h_
 #define _glxbuf_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.2 1999/06/14 07:31:25 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxbuf.h,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 extern void __glXFBInitDrawable(__GLXdrawablePrivate *glxPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxcmds.c b/xc/programs/Xserver/GL/glx/glxcmds.c
index 64b28a206..a622c15d4 100644
--- a/xc/programs/Xserver/GL/glx/glxcmds.c
+++ b/xc/programs/Xserver/GL/glx/glxcmds.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.5 2000/06/17 00:03:12 martin Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.3.42.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcmds.c,v 1.3.42.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -32,6 +47,7 @@
 #include "glximports.h"
 #include "glxutil.h"
 #include "glxext.h"
+#include "GL/glx_ansic.h"
 
 /************************************************************************/
 
@@ -43,12 +59,14 @@ static __GLimports imports = {
     __glXImpWarning,
     __glXImpFatal,
     __glXImpGetenv,
+    __glXImpAtoi,
     __glXImpSprintf,
     __glXImpFopen,
     __glXImpFclose,
     __glXImpFprintf,
     __glXImpGetDrawablePrivate,
     NULL,
+    NULL
 };
 
 /************************************************************************/
diff --git a/xc/programs/Xserver/GL/glx/glxcmdsswap.c b/xc/programs/Xserver/GL/glx/glxcmdsswap.c
index 6437c2938..e22873285 100644
--- a/xc/programs/Xserver/GL/glx/glxcmdsswap.c
+++ b/xc/programs/Xserver/GL/glx/glxcmdsswap.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -31,6 +46,7 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "glxext.h"
+#include "GL/glx_ansic.h"
 
 /************************************************************************/
 
@@ -763,7 +779,7 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
 
     if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
           (vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT))  {
-	(*__glXSwapVendorPrivTable_EXT[vendorcode])(cl, (GLbyte*)req);
+	(*__glXSwapVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT])(cl, (GLbyte*)req);
 	return Success;
     }
     cl->client->errorValue = req->vendorCode;
@@ -785,7 +801,7 @@ int __glXSwapVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
 
     if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
           (vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT))  {
-	return (*__glXSwapVendorPrivTable_EXT[vendorcode])(cl, (GLbyte*)req);
+	return (*__glXSwapVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT])(cl, (GLbyte*)req);
     }
     cl->client->errorValue = req->vendorCode;
     return __glXUnsupportedPrivateRequest;
diff --git a/xc/programs/Xserver/GL/glx/glxcontext.h b/xc/programs/Xserver/GL/glx/glxcontext.h
index c3e353fc7..2e5a2ce2f 100644
--- a/xc/programs/Xserver/GL/glx/glxcontext.h
+++ b/xc/programs/Xserver/GL/glx/glxcontext.h
@@ -1,26 +1,41 @@
 #ifndef _GLX_context_h_
 #define _GLX_context_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcontext.h,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 typedef struct __GLXcontextRec __GLXcontext;
diff --git a/xc/programs/Xserver/GL/glx/glxdrawable.h b/xc/programs/Xserver/GL/glx/glxdrawable.h
index 89fe4dbcb..7b32f3a37 100644
--- a/xc/programs/Xserver/GL/glx/glxdrawable.h
+++ b/xc/programs/Xserver/GL/glx/glxdrawable.h
@@ -1,26 +1,41 @@
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 typedef struct {
@@ -76,7 +91,7 @@ struct __GLXdrawablePrivateRec {
     GLboolean (*swapBuffers)(struct __GLXdrawablePrivateRec *);
 
     /*
-    ** The GL drawable (information shared between GLX and the GL core
+    ** The GL drawable (information shared between GLX and the GL core)
     */
     __GLdrawablePrivate glPriv;
 
diff --git a/xc/programs/Xserver/GL/glx/glxerror.h b/xc/programs/Xserver/GL/glx/glxerror.h
index d6adf95a6..9874d079d 100644
--- a/xc/programs/Xserver/GL/glx/glxerror.h
+++ b/xc/programs/Xserver/GL/glx/glxerror.h
@@ -1,26 +1,41 @@
 #ifndef _GLX_error_h_
 #define _GLX_error_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxerror.h,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxext.c b/xc/programs/Xserver/GL/glx/glxext.c
index 240a8cba5..07eb51e54 100644
--- a/xc/programs/Xserver/GL/glx/glxext.c
+++ b/xc/programs/Xserver/GL/glx/glxext.c
@@ -16,7 +16,8 @@
 ** Those portions of the Subject Software created by Silicon Graphics, Inc.
 ** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
 **
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.4.8.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxext.c,v 1.1.1.4.8.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -216,7 +217,7 @@ GLboolean __glXErrorOccured(void)
 */
 void GlxExtensionInit(void)
 {
-    ExtensionEntry *extEntry, *AddExtension();
+    ExtensionEntry *extEntry;
     int i;
     
 #ifdef X11R5
diff --git a/xc/programs/Xserver/GL/glx/glxext.h b/xc/programs/Xserver/GL/glx/glxext.h
index 543eefcd6..a186f403c 100644
--- a/xc/programs/Xserver/GL/glx/glxext.h
+++ b/xc/programs/Xserver/GL/glx/glxext.h
@@ -1,46 +1,64 @@
 #ifndef _glxext_h_
 #define _glxext_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.3 1999/06/14 07:31:27 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxext.h,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
+/*
+ * Added by VA Linux for XFree86 4.0.x
+ */
 typedef struct {
     int type;
     void (*resetExtension)(void);
     Bool (*initVisuals)(
-	VisualPtr *       visualp,
-	DepthPtr *        depthp,
-	int *             nvisualp,
-	int *             ndepthp,
-	int *             rootDepthp,
-	VisualID *        defaultVisp,
-	unsigned long     sizes,
-	int               bitsPerRGB
-	);
+        VisualPtr *       visualp,
+        DepthPtr *        depthp,
+        int *             nvisualp,
+        int *             ndepthp,
+        int *             rootDepthp,
+        VisualID *        defaultVisp,
+        unsigned long     sizes,
+        int               bitsPerRGB
+        );
     void (*setVisualConfigs)(
-	int                nconfigs,
-	__GLXvisualConfig *configs,
-	void              **privates
-	);
+        int                nconfigs,
+        __GLXvisualConfig *configs,
+        void              **privates
+        );
 } __GLXextensionInfo;
 
 extern GLboolean __glXFreeContext(__GLXcontext *glxc);
@@ -56,14 +74,12 @@ extern void __glXResetLargeCommandStatus(__GLXclientState*);
 extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
 extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc);
 
-extern Bool __glXCoreType(void);
 extern void GlxExtensionInit(void);
-extern void GlxSetVisualConfigs(
-    int nconfigs,
-    __GLXvisualConfig *configs,
-    void **privates
-);
+
+extern Bool __glXCoreType(void);
+
 extern int GlxInitVisuals(
+#if NeedFunctionPrototypes
     VisualPtr *       visualp,
     DepthPtr *        depthp,
     int *             nvisualp,
@@ -73,6 +89,7 @@ extern int GlxInitVisuals(
     unsigned long     sizes,
     int               bitsPerRGB,
     int               preferredVis
+#endif
 );
 
 #endif /* _glxext_h_ */
diff --git a/xc/programs/Xserver/GL/glx/glxfb.c b/xc/programs/Xserver/GL/glx/glxfb.c
index 67ea31434..2a6450820 100644
--- a/xc/programs/Xserver/GL/glx/glxfb.c
+++ b/xc/programs/Xserver/GL/glx/glxfb.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.2 1999/06/14 07:31:27 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:23 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxfb.c,v 1.1.1.3.18.1 2001/02/15 04:14:23 gareth Exp $
 */
 
 /*
@@ -30,7 +45,7 @@
 
 #include <gcstruct.h>
 
-/* can't include glmath.h */
+/* so we don't include glmath.h */
 extern GLuint __glFloorLog2(GLuint);
 
 typedef struct __GLFBbufferInfoRec {
diff --git a/xc/programs/Xserver/GL/glx/glxfb.h b/xc/programs/Xserver/GL/glx/glxfb.h
index 9b6022591..47be6fe90 100644
--- a/xc/programs/Xserver/GL/glx/glxfb.h
+++ b/xc/programs/Xserver/GL/glx/glxfb.h
@@ -1,26 +1,41 @@
 #ifndef _glxfb_h_
 #define _glxfb_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.2 1999/06/14 07:31:30 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxfb.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern void __glXInitFB(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glximports.c b/xc/programs/Xserver/GL/glx/glximports.c
index 2dc836571..3bd9f1197 100644
--- a/xc/programs/Xserver/GL/glx/glximports.c
+++ b/xc/programs/Xserver/GL/glx/glximports.c
@@ -1,28 +1,44 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glximports.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #include "glxserver.h"
 #include "glxcontext.h"
 #include "glximports.h"
+#include "GL/glx_ansic.h"
 
 void *__glXImpMalloc(__GLcontext *gc, size_t size)
 {
@@ -105,6 +121,11 @@ char *__glXImpGetenv(__GLcontext *gc, const char *var)
     return __glXGetenv(var);
 }
 
+int __glXImpAtoi(__GLcontext *gc, const char *str)
+{
+    return __glXAtoi(str);
+}
+
 int __glXImpSprintf(__GLcontext *gc, char *str, const char *fmt, ...)
 {
     va_list ap;
diff --git a/xc/programs/Xserver/GL/glx/glximports.h b/xc/programs/Xserver/GL/glx/glximports.h
index b6a1580c7..0a3e880c6 100644
--- a/xc/programs/Xserver/GL/glx/glximports.h
+++ b/xc/programs/Xserver/GL/glx/glximports.h
@@ -1,26 +1,41 @@
 #ifndef _glximports_h_
 #define _glximports_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.2 1999/06/14 07:31:30 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glximports.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern void *__glXImpMalloc(__GLcontext *gc, size_t size);
@@ -32,6 +47,7 @@ extern void  __glXImpWarning(__GLcontext *gc, char *msg);
 extern void  __glXImpFatal(__GLcontext *gc, char *msg);
 
 extern char *__glXImpGetenv(__GLcontext *gc, const char *var);
+extern int   __glXImpAtoi(__GLcontext *gc, const char *str);
 extern int   __glXImpSprintf(__GLcontext *gc, char *str, const char *fmt, ...);
 extern void *__glXImpFopen(__GLcontext *gc, const char *path, 
 			   const char *mode);
diff --git a/xc/programs/Xserver/GL/glx/glxmem.c b/xc/programs/Xserver/GL/glx/glxmem.c
index 52a60f848..a7e02e335 100644
--- a/xc/programs/Xserver/GL/glx/glxmem.c
+++ b/xc/programs/Xserver/GL/glx/glxmem.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxmem.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxmem.h b/xc/programs/Xserver/GL/glx/glxmem.h
index 1c208a2f5..aec834253 100644
--- a/xc/programs/Xserver/GL/glx/glxmem.h
+++ b/xc/programs/Xserver/GL/glx/glxmem.h
@@ -1,26 +1,41 @@
 #ifndef _glxmem_h_
 #define _glxmem_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.2 1999/06/14 07:31:31 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxmem.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern void __glXInitMem(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxpix.c b/xc/programs/Xserver/GL/glx/glxpix.c
index 8771bb0e0..a41893d34 100644
--- a/xc/programs/Xserver/GL/glx/glxpix.c
+++ b/xc/programs/Xserver/GL/glx/glxpix.c
@@ -1,23 +1,39 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.4.8.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxpix.c,v 1.1.1.4.8.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxpix.h b/xc/programs/Xserver/GL/glx/glxpix.h
index 09a33a80a..f0e33bc4b 100644
--- a/xc/programs/Xserver/GL/glx/glxpix.h
+++ b/xc/programs/Xserver/GL/glx/glxpix.h
@@ -1,26 +1,41 @@
 #ifndef _glxpix_h_
 #define _glxpix_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.2 1999/06/14 07:31:31 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxpix.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern void __glXInitPix(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxscreens.c b/xc/programs/Xserver/GL/glx/glxscreens.c
index d68bca06e..e0494a0e3 100644
--- a/xc/programs/Xserver/GL/glx/glxscreens.c
+++ b/xc/programs/Xserver/GL/glx/glxscreens.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.4 2000/06/17 00:03:12 martin Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.3.42.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxscreens.c,v 1.3.42.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #ifdef IN_MODULE
@@ -32,6 +47,15 @@
 #include "glxserver.h"
 #include "glxutil.h"
 
+static char GLServerExtensions[] = 
+			"GL_ARB_multitexture "
+			"GL_ARB_imaging "
+			"GL_EXT_abgr "
+			"GL_EXT_blend_color "
+			"GL_EXT_blend_minmax "
+			"GL_EXT_blend_subtract "
+			;
+
 /*
 ** We have made the simplifying assuption that the same extensions are 
 ** supported across all screens in a multi-screen system.
@@ -41,7 +65,8 @@ static char GLXServerVersion[] = "1.2";
 static char GLXServerExtensions[] = 
 			"GLX_EXT_visual_info "
 			"GLX_EXT_visual_rating "
-			"GLX_EXT_import_context ";
+			"GLX_EXT_import_context "
+			;
 
 /*
 ** This comes from the GL library that the server will link with.  Right
@@ -259,6 +284,7 @@ void __glXScreenInit(GLint numscreens)
 #else
 		__glXActiveScreens[i].numUsableVisuals = __glXActiveScreens[i].numVisuals;
 #endif
+		__glXActiveScreens[i].GLextensions = __glXStrdup(GLServerExtensions);
 		__glXActiveScreens[i].GLXvendor = __glXStrdup(GLXServerVendorName);
 		__glXActiveScreens[i].GLXversion = __glXStrdup(GLXServerVersion);
 		__glXActiveScreens[i].GLXextensions = __glXStrdup(GLXServerExtensions);
diff --git a/xc/programs/Xserver/GL/glx/glxscreens.h b/xc/programs/Xserver/GL/glx/glxscreens.h
index 771ecf866..e0fdfbf6c 100644
--- a/xc/programs/Xserver/GL/glx/glxscreens.h
+++ b/xc/programs/Xserver/GL/glx/glxscreens.h
@@ -1,30 +1,47 @@
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.2 1999/06/14 07:31:32 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxscreens.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #include "GL/internal/glcore.h"
 
+
+
 /*
 ** Screen dependent data.  These methods are the interface between the DIX
 ** and DDX layers of the GLX server extension.  The methods provide an
@@ -58,6 +75,8 @@ typedef struct {
     GLint numVisuals;
     GLint numUsableVisuals;
 
+    char *GLextensions;
+
     char *GLXvendor;
     char *GLXversion;
     char *GLXextensions;
diff --git a/xc/programs/Xserver/GL/glx/glxserver.h b/xc/programs/Xserver/GL/glx/glxserver.h
index 80a23ce1a..0ee0f722d 100644
--- a/xc/programs/Xserver/GL/glx/glxserver.h
+++ b/xc/programs/Xserver/GL/glx/glxserver.h
@@ -1,26 +1,41 @@
 #ifndef _GLX_server_h_
 #define _GLX_server_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.2 1999/06/14 07:31:32 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxserver.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #include <X11/X.h>
@@ -42,6 +57,7 @@
 #undef abs
 #undef fabs
 
+#define GL_GLEXT_PROTOTYPES /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glxproto.h>
 #include <GL/glxint.h>
@@ -110,7 +126,7 @@ struct __GLXclientStateRec {
     */
     GLbyte *returnBuf;
     GLint returnBufSize;
-    
+
     /*
     ** Keep track of large rendering commands, which span multiple requests.
     */
@@ -127,7 +143,7 @@ struct __GLXclientStateRec {
     */
     __GLXcontext **currentContexts;
     GLint numCurrentContexts;
-    
+
     /* Back pointer to X client record */
     ClientPtr client;
 
@@ -168,7 +184,7 @@ typedef struct {
 } __GLXrenderSizeData;
 extern __GLXrenderSizeData __glXRenderSizeTable[];
 extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];
-  
+
 /************************************************************************/
 
 /*
@@ -215,6 +231,15 @@ extern void glxSwapQueryServerStringReply(ClientPtr client,
  * Routines for computing the size of variably-sized rendering commands.
  */
 
+extern int __glXTypeSize(GLenum enm);
+extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,
+			  GLint rowLength, GLint skipRows, GLint alignment);
+extern int __glXImage3DSize(GLenum format, GLenum type,
+			    GLsizei w, GLsizei h, GLsizei d,
+			    GLint imageHeight, GLint rowLength,
+			    GLint skipImages, GLint skipRows,
+			    GLint alignment);
+
 extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);
 extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);
 extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);
@@ -242,10 +267,28 @@ extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);
 extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);
 extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);
 extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);
-extern int __glXTypeSize(GLenum enm);
 extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);
 extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);
 extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);
 extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );
+extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);
+extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);
+extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);
+
+/*
+ * Routines for computing the size of returned data.
+ */
+extern int __glXConvolutionParameterivSize(GLenum pname);
+extern int __glXConvolutionParameterfvSize(GLenum pname);
+extern int __glXColorTableParameterfvSize(GLenum pname);
+extern int __glXColorTableParameterivSize(GLenum pname);
 
 #endif /* !__GLX_server_h__ */
diff --git a/xc/programs/Xserver/GL/glx/glxutil.c b/xc/programs/Xserver/GL/glx/glxutil.c
index c5d33d604..d486d9881 100644
--- a/xc/programs/Xserver/GL/glx/glxutil.c
+++ b/xc/programs/Xserver/GL/glx/glxutil.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxutil.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -29,6 +44,7 @@
 #include <windowstr.h>
 #include "glxutil.h"
 #include "glxbuf.h"
+#include "GL/glx_ansic.h"
 
 /************************************************************************/
 
@@ -200,8 +216,12 @@ __glXFormatGLModes(__GLcontextModes *modes, __GLXvisualConfig *config)
     modes->greenMask = config->greenMask;
     modes->blueMask = config->blueMask;
     modes->alphaMask = config->alphaMask;
+#if 0
     modes->rgbBits = modes->redBits + modes->greenBits + 
 	modes->blueBits + modes->alphaBits;
+#endif
+    assert( !modes->rgbMode || ((config->bufferSize & 0x7) == 0) );
+    modes->rgbBits = config->bufferSize;
     modes->indexBits = config->bufferSize;
 
     modes->accumRedBits = config->accumRedSize;
@@ -234,8 +254,6 @@ LockDP(__GLdrawablePrivate *glPriv, __GLcontext *gc)
 
     /* some pending state.  Deal with it */
     if (glxc->pendingState & __GLX_PENDING_RESIZE) {
-	__GLXdrawablePrivate *glxPriv = glxc->glxPriv;
-
 	glxc->pendingState &= ~__GLX_PENDING_RESIZE;
 
 	(*glci->exports.notifyResize)(gc);
diff --git a/xc/programs/Xserver/GL/glx/glxutil.h b/xc/programs/Xserver/GL/glx/glxutil.h
index d074d77ce..ded3bb238 100644
--- a/xc/programs/Xserver/GL/glx/glxutil.h
+++ b/xc/programs/Xserver/GL/glx/glxutil.h
@@ -1,26 +1,41 @@
 #ifndef _glxcmds_h_
 #define _glxcmds_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.2 1999/06/14 07:31:33 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxutil.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern void __glXNop(void);
diff --git a/xc/programs/Xserver/GL/glx/impsize.h b/xc/programs/Xserver/GL/glx/impsize.h
index 597da569e..80f3083d9 100644
--- a/xc/programs/Xserver/GL/glx/impsize.h
+++ b/xc/programs/Xserver/GL/glx/impsize.h
@@ -1,26 +1,41 @@
 #ifndef _impsize_h_
 #define _impsize_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.2 1999/06/14 07:31:33 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/impsize.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 /*
@@ -31,6 +46,10 @@
 ** replicate the code in here.
 */
 extern int __glCallLists_size(GLsizei n, GLenum type);
+extern int __glColorTableParameterfv_size(GLenum pname);
+extern int __glColorTableParameteriv_size(GLenum pname);
+extern int __glConvolutionParameterfv_size(GLenum pname);
+extern int __glConvolutionParameteriv_size(GLenum pname);
 extern int __glDrawPixels_size(GLenum format, GLenum type, GLsizei w,GLsizei h);
 extern int __glFogfv_size(GLenum pname);
 extern int __glFogiv_size(GLenum pname);
@@ -47,7 +66,6 @@ extern int __glTexGenfv_size(GLenum e);
 extern int __glTexGeniv_size(GLenum pname);
 extern int __glTexParameterfv_size(GLenum e);
 extern int __glTexParameteriv_size(GLenum e);
-
 extern int __glEvalComputeK(GLenum target);
 
 #endif /* _impsize_h_ */
diff --git a/xc/programs/Xserver/GL/glx/render2.c b/xc/programs/Xserver/GL/glx/render2.c
index 01a57411d..fe3efe85e 100644
--- a/xc/programs/Xserver/GL/glx/render2.c
+++ b/xc/programs/Xserver/GL/glx/render2.c
@@ -1,29 +1,45 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/render2.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 /* #define NEED_REPLIES */
-#include "glxserver.h"
+#include <glxserver.h>
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 extern GLint __glEvalComputeK(GLenum target);
 
@@ -33,7 +49,7 @@ void __glXDisp_Map1f(GLbyte *pc)
     GLfloat u1, u2, *points;
     GLenum target;
 
-    target = *(GLenum *)(pc + 0); 
+    target = *(GLenum *)(pc + 0);
     order = *(GLint *)(pc + 12);
     u1 = *(GLfloat *)(pc + 4);
     u2 = *(GLfloat *)(pc + 8);
@@ -48,8 +64,8 @@ void __glXDisp_Map2f(GLbyte *pc)
     GLint uorder, vorder, ustride, vstride, k;
     GLfloat u1, u2, v1, v2, *points;
     GLenum target;
-    
-    target = *(GLenum *)(pc + 0); 
+
+    target = *(GLenum *)(pc + 0);
     uorder = *(GLint *)(pc + 12);
     vorder = *(GLint *)(pc + 24);
     u1 = *(GLfloat *)(pc + 4);
@@ -169,7 +185,7 @@ void __glXDisp_DrawArrays(GLbyte *pc)
 	GLenum datatype = compHeader[i].datatype;
 	GLint numVals = compHeader[i].numVals;
 
-        stride += __GLX_PAD(numVals * __glXTypeSize(datatype));
+	stride += __GLX_PAD(numVals * __glXTypeSize(datatype));
     }
 
     pc += numComponents * sizeof(__GLXdispatchDrawArraysComponentHeader);
@@ -180,36 +196,36 @@ void __glXDisp_DrawArrays(GLbyte *pc)
 	GLint numVals = compHeader[i].numVals;
 	GLenum component = compHeader[i].component;
 
-        switch (component) {
-          case GL_VERTEX_ARRAY:
+	switch (component) {
+	  case GL_VERTEX_ARRAY:
 	    glEnableClientState(GL_VERTEX_ARRAY);
 	    glVertexPointer(numVals, datatype, stride, pc);
-            break;
-          case GL_NORMAL_ARRAY:
+	    break;
+	  case GL_NORMAL_ARRAY:
 	    glEnableClientState(GL_NORMAL_ARRAY);
 	    glNormalPointer(datatype, stride, pc);
-            break;
-          case GL_COLOR_ARRAY:
+	    break;
+	  case GL_COLOR_ARRAY:
 	    glEnableClientState(GL_COLOR_ARRAY);
 	    glColorPointer(numVals, datatype, stride, pc);
-            break;
-          case GL_INDEX_ARRAY:
+	    break;
+	  case GL_INDEX_ARRAY:
 	    glEnableClientState(GL_INDEX_ARRAY);
 	    glIndexPointer(datatype, stride, pc);
-            break;
-          case GL_TEXTURE_COORD_ARRAY:
+	    break;
+	  case GL_TEXTURE_COORD_ARRAY:
 	    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	    glTexCoordPointer(numVals, datatype, stride, pc);
-            break;
-          case GL_EDGE_FLAG_ARRAY:
+	    break;
+	  case GL_EDGE_FLAG_ARRAY:
 	    glEnableClientState(GL_EDGE_FLAG_ARRAY);
 	    glEdgeFlagPointer(stride, (const GLboolean *)pc);
-            break;
-          default:
-            break;
+	    break;
+	  default:
+	    break;
 	}
 
-        pc += __GLX_PAD(numVals * __glXTypeSize(datatype));
+	pc += __GLX_PAD(numVals * __glXTypeSize(datatype));
     }
 
     glDrawArrays(primType, 0, numVertexes);
@@ -222,3 +238,9 @@ void __glXDisp_DrawArrays(GLbyte *pc)
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glDisableClientState(GL_EDGE_FLAG_ARRAY);
 }
+
+void __glXDisp_DrawArraysEXT(GLbyte *pc)
+{
+#ifdef XXX_STUB
+#endif /*XXX_STUB*/
+}
diff --git a/xc/programs/Xserver/GL/glx/render2swap.c b/xc/programs/Xserver/GL/glx/render2swap.c
index 040a24594..368d36709 100644
--- a/xc/programs/Xserver/GL/glx/render2swap.c
+++ b/xc/programs/Xserver/GL/glx/render2swap.c
@@ -1,29 +1,45 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/render2swap.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 /* #define NEED_REPLIES */
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 extern GLint __glEvalComputeK(GLenum target);
 
@@ -363,3 +379,9 @@ void __glXDispSwap_DrawArrays(GLbyte *pc)
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glDisableClientState(GL_EDGE_FLAG_ARRAY);
 }
+
+void __glXDispSwap_DrawArraysEXT(GLbyte *pc)
+{
+#ifdef XXX_STUB
+#endif /*XXX_STUB*/
+}
diff --git a/xc/programs/Xserver/GL/glx/renderpix.c b/xc/programs/Xserver/GL/glx/renderpix.c
index bbaab81a9..e7521c697 100644
--- a/xc/programs/Xserver/GL/glx/renderpix.c
+++ b/xc/programs/Xserver/GL/glx/renderpix.c
@@ -1,29 +1,45 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/renderpix.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 void __glXDisp_PolygonStipple(GLbyte *pc)
 {
@@ -48,12 +64,12 @@ void __glXDisp_Bitmap(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glBitmap((GLsizei) hdr->width, 
-	     (GLsizei) hdr->height, 
-	     (GLfloat) hdr->xorig, 
-	     (GLfloat) hdr->yorig, 
+    glBitmap((GLsizei) hdr->width,
+	     (GLsizei) hdr->height,
+	     (GLfloat) hdr->xorig,
+	     (GLfloat) hdr->yorig,
 	     (GLfloat) hdr->xmove,
-	     (GLfloat) hdr->ymove, 
+	     (GLfloat) hdr->ymove,
 	     (GLubyte *)(hdr+1));
 }
 
@@ -68,13 +84,13 @@ void __glXDisp_TexImage1D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexImage1D(hdr->target, 
-		 (GLint) hdr->level, 
-		 (GLint) hdr->components, 
+    glTexImage1D(hdr->target,
+		 (GLint) hdr->level,
+		 (GLint) hdr->components,
 		 (GLsizei) hdr->width,
-		 (GLint) hdr->border, 
-		 hdr->format, 
-		 hdr->type, 
+		 (GLint) hdr->border,
+		 hdr->format,
+		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
 
@@ -89,17 +105,35 @@ void __glXDisp_TexImage2D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexImage2D(hdr->target, 
-		 (GLint) hdr->level, 
-		 (GLint) hdr->components, 
+    glTexImage2D(hdr->target,
+		 (GLint) hdr->level,
+		 (GLint) hdr->components,
 		 (GLsizei) hdr->width,
-		 (GLsizei) hdr->height, 
-		 (GLint) hdr->border, 
-		 hdr->format, 
+		 (GLsizei) hdr->height,
+		 (GLint) hdr->border,
+		 hdr->format,
 		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
 
+void __glXDisp_TexImage3D(GLbyte *pc)
+{
+    __GLXdispatchTexImage3DHeader *hdr = (__GLXdispatchTexImage3DHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glTexImage3D(hdr->target, hdr->level, hdr->internalformat, hdr->width,
+		 hdr->height, hdr->depth, hdr->border, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
 void __glXDisp_DrawPixels(GLbyte *pc)
 {
     __GLXdispatchDrawPixelsHeader *hdr = (__GLXdispatchDrawPixelsHeader *) pc;
@@ -111,9 +145,9 @@ void __glXDisp_DrawPixels(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glDrawPixels((GLsizei) hdr->width, 
-		 (GLsizei) hdr->height, 
-		 hdr->format, 
+    glDrawPixels((GLsizei) hdr->width,
+		 (GLsizei) hdr->height,
+		 hdr->format,
 		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
@@ -129,12 +163,12 @@ void __glXDisp_TexSubImage1D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexSubImage1D(hdr->target, 
-		    (GLint) hdr->level, 
-		    (GLint) hdr->xoffset, 
+    glTexSubImage1D(hdr->target,
+		    (GLint) hdr->level,
+		    (GLint) hdr->xoffset,
 		    (GLsizei) hdr->width,
-		    hdr->format, 
-		    hdr->type, 
+		    hdr->format,
+		    hdr->type,
 		    (GLvoid *)(hdr+1));
 }
 
@@ -149,13 +183,126 @@ void __glXDisp_TexSubImage2D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexSubImage2D(hdr->target, 
-		    (GLint) hdr->level, 
-		    (GLint) hdr->xoffset, 
+    glTexSubImage2D(hdr->target,
+		    (GLint) hdr->level,
+		    (GLint) hdr->xoffset,
 		    (GLint) hdr->yoffset,
-		    (GLsizei) hdr->width, 
-		    (GLsizei) hdr->height, 
-		    hdr->format, 
+		    (GLsizei) hdr->width,
+		    (GLsizei) hdr->height,
+		    hdr->format,
 		    hdr->type,
 		    (GLvoid *)(hdr+1));
 }
+
+void __glXDisp_TexSubImage3D(GLbyte *pc)
+{
+    __GLXdispatchTexSubImage3DHeader *hdr =
+				(__GLXdispatchTexSubImage3DHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glTexSubImage3D(hdr->target, hdr->level, hdr->xoffset, hdr->yoffset,
+		       hdr->zoffset, hdr->width, hdr->height, hdr->depth,
+		       hdr->format, hdr->type, (GLvoid *)(hdr+1));
+}
+
+void __glXDisp_ColorTable(GLbyte *pc)
+{
+   __GLXdispatchColorTableHeader *hdr =
+				(__GLXdispatchColorTableHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glColorTable(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDisp_ColorSubTable(GLbyte *pc)
+{
+   __GLXdispatchColorSubTableHeader *hdr =
+				(__GLXdispatchColorSubTableHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glColorSubTable(hdr->target, hdr->start, hdr->count, hdr->format,
+		    hdr->type, (GLvoid *)(hdr+1));
+}
+
+void __glXDisp_ConvolutionFilter1D(GLbyte *pc)
+{
+   __GLXdispatchConvolutionFilterHeader *hdr =
+				(__GLXdispatchConvolutionFilterHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glConvolutionFilter1D(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDisp_ConvolutionFilter2D(GLbyte *pc)
+{
+   __GLXdispatchConvolutionFilterHeader *hdr =
+				 (__GLXdispatchConvolutionFilterHeader *) pc;
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glConvolutionFilter2D(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->height, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDisp_SeparableFilter2D(GLbyte *pc)
+{
+   __GLXdispatchConvolutionFilterHeader *hdr =
+				(__GLXdispatchConvolutionFilterHeader *) pc;
+    GLint hdrlen, image1len;
+
+    hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_DISPATCH_HDR_SIZE);
+
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    /* XXX check this usage - internal code called
+    ** a version without the packing parameters
+    */
+    image1len = __glXImageSize(hdr->format, hdr->type, hdr->width, 1,
+			       hdr->rowLength, hdr->skipRows, hdr->alignment);
+    image1len = __GLX_PAD(image1len);
+
+    glSeparableFilter2D(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->height, hdr->format, hdr->type,
+		 ((GLubyte *)hdr+hdrlen), ((GLubyte *)hdr+hdrlen+image1len));
+}
diff --git a/xc/programs/Xserver/GL/glx/renderpixswap.c b/xc/programs/Xserver/GL/glx/renderpixswap.c
index 51e96844e..90a06a2f4 100644
--- a/xc/programs/Xserver/GL/glx/renderpixswap.c
+++ b/xc/programs/Xserver/GL/glx/renderpixswap.c
@@ -1,29 +1,45 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 void __glXDispSwap_PolygonStipple(GLbyte *pc)
 {
@@ -53,26 +69,26 @@ void __glXDispSwap_Bitmap(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->width);
     __GLX_SWAP_INT((GLbyte *)&hdr->height);
     __GLX_SWAP_FLOAT((GLbyte *)&hdr->xorig);
     __GLX_SWAP_FLOAT((GLbyte *)&hdr->yorig);
     __GLX_SWAP_FLOAT((GLbyte *)&hdr->xmove);
     __GLX_SWAP_FLOAT((GLbyte *)&hdr->ymove);
-    
+
     glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength);
     glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows);
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glBitmap((GLsizei) hdr->width, 
-	     (GLsizei) hdr->height, 
-	     (GLfloat) hdr->xorig, 
-	     (GLfloat) hdr->yorig, 
+    glBitmap((GLsizei) hdr->width,
+	     (GLsizei) hdr->height,
+	     (GLfloat) hdr->xorig,
+	     (GLfloat) hdr->yorig,
 	     (GLfloat) hdr->xmove,
-	     (GLfloat) hdr->ymove, 
+	     (GLfloat) hdr->ymove,
 	     (GLubyte *)(hdr+1));
 }
 
@@ -85,7 +101,7 @@ void __glXDispSwap_TexImage1D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->target);
     __GLX_SWAP_INT((GLbyte *)&hdr->level);
     __GLX_SWAP_INT((GLbyte *)&hdr->components);
@@ -94,7 +110,7 @@ void __glXDispSwap_TexImage1D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->border);
     __GLX_SWAP_INT((GLbyte *)&hdr->format);
     __GLX_SWAP_INT((GLbyte *)&hdr->type);
-    
+
     /*
     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
     ** the pixel data.
@@ -106,13 +122,13 @@ void __glXDispSwap_TexImage1D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexImage1D(hdr->target, 
-		 (GLint) hdr->level, 
-		 (GLint) hdr->components, 
+    glTexImage1D(hdr->target,
+		 (GLint) hdr->level,
+		 (GLint) hdr->components,
 		 (GLsizei) hdr->width,
-		 (GLint) hdr->border, 
-		 hdr->format, 
-		 hdr->type, 
+		 (GLint) hdr->border,
+		 hdr->format,
+		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
 
@@ -125,7 +141,7 @@ void __glXDispSwap_TexImage2D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->target);
     __GLX_SWAP_INT((GLbyte *)&hdr->level);
     __GLX_SWAP_INT((GLbyte *)&hdr->components);
@@ -134,7 +150,7 @@ void __glXDispSwap_TexImage2D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->border);
     __GLX_SWAP_INT((GLbyte *)&hdr->format);
     __GLX_SWAP_INT((GLbyte *)&hdr->type);
-    
+
     /*
     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
     ** the pixel data.
@@ -146,17 +162,60 @@ void __glXDispSwap_TexImage2D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexImage2D(hdr->target, 
-		 (GLint) hdr->level, 
-		 (GLint) hdr->components, 
+    glTexImage2D(hdr->target,
+		 (GLint) hdr->level,
+		 (GLint) hdr->components,
 		 (GLsizei) hdr->width,
-		 (GLsizei) hdr->height, 
-		 (GLint) hdr->border, 
-		 hdr->format, 
+		 (GLsizei) hdr->height,
+		 (GLint) hdr->border,
+		 hdr->format,
 		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
 
+void __glXDispSwap_TexImage3D(GLbyte *pc)
+{
+    __GLXdispatchTexImage3DHeader *hdr = (__GLXdispatchTexImage3DHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->imageHeight);
+    __GLX_SWAP_INT((GLbyte *)&hdr->imageDepth);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipImages);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipVolumes);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->level);
+    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->height);
+    __GLX_SWAP_INT((GLbyte *)&hdr->depth);
+    __GLX_SWAP_INT((GLbyte *)&hdr->size4d);
+    __GLX_SWAP_INT((GLbyte *)&hdr->border);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glTexImage3D(hdr->target, hdr->level, hdr->internalformat, hdr->width,
+		 hdr->height, hdr->depth, hdr->border, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
 void __glXDispSwap_DrawPixels(GLbyte *pc)
 {
     __GLXdispatchDrawPixelsHeader *hdr = (__GLXdispatchDrawPixelsHeader *) pc;
@@ -166,12 +225,12 @@ void __glXDispSwap_DrawPixels(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->width);
     __GLX_SWAP_INT((GLbyte *)&hdr->height);
     __GLX_SWAP_INT((GLbyte *)&hdr->format);
     __GLX_SWAP_INT((GLbyte *)&hdr->type);
-    
+
     /*
     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
     ** the pixel data.
@@ -183,9 +242,9 @@ void __glXDispSwap_DrawPixels(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glDrawPixels((GLsizei) hdr->width, 
-		 (GLsizei) hdr->height, 
-		 hdr->format, 
+    glDrawPixels((GLsizei) hdr->width,
+		 (GLsizei) hdr->height,
+		 hdr->format,
 		 hdr->type,
 		 (GLvoid *)(hdr+1));
 }
@@ -199,14 +258,14 @@ void __glXDispSwap_TexSubImage1D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->target);
     __GLX_SWAP_INT((GLbyte *)&hdr->level);
     __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);
     __GLX_SWAP_INT((GLbyte *)&hdr->width);
     __GLX_SWAP_INT((GLbyte *)&hdr->format);
     __GLX_SWAP_INT((GLbyte *)&hdr->type);
-    
+
     /*
     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
     ** the pixel data.
@@ -218,12 +277,12 @@ void __glXDispSwap_TexSubImage1D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexSubImage1D(hdr->target, 
-		    (GLint) hdr->level, 
-		    (GLint) hdr->xoffset, 
+    glTexSubImage1D(hdr->target,
+		    (GLint) hdr->level,
+		    (GLint) hdr->xoffset,
 		    (GLsizei) hdr->width,
-		    hdr->format, 
-		    hdr->type, 
+		    hdr->format,
+		    hdr->type,
 		    (GLvoid *)(hdr+1));
 }
 
@@ -236,7 +295,7 @@ void __glXDispSwap_TexSubImage2D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
     __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
     __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
-    
+
     __GLX_SWAP_INT((GLbyte *)&hdr->target);
     __GLX_SWAP_INT((GLbyte *)&hdr->level);
     __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);
@@ -245,7 +304,7 @@ void __glXDispSwap_TexSubImage2D(GLbyte *pc)
     __GLX_SWAP_INT((GLbyte *)&hdr->height);
     __GLX_SWAP_INT((GLbyte *)&hdr->format);
     __GLX_SWAP_INT((GLbyte *)&hdr->type);
-    
+
     /*
     ** Just invert swapBytes flag; the GL will figure out if it needs to swap
     ** the pixel data.
@@ -257,13 +316,236 @@ void __glXDispSwap_TexSubImage2D(GLbyte *pc)
     glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels);
     glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment);
 
-    glTexSubImage2D(hdr->target, 
-		    (GLint) hdr->level, 
-		    (GLint) hdr->xoffset, 
+    glTexSubImage2D(hdr->target,
+		    (GLint) hdr->level,
+		    (GLint) hdr->xoffset,
 		    (GLint) hdr->yoffset,
-		    (GLsizei) hdr->width, 
-		    (GLsizei) hdr->height, 
-		    hdr->format, 
+		    (GLsizei) hdr->width,
+		    (GLsizei) hdr->height,
+		    hdr->format,
 		    hdr->type,
 		    (GLvoid *)(hdr+1));
 }
+
+void __glXDispSwap_TexSubImage3D(GLbyte *pc)
+{
+    __GLXdispatchTexSubImage3DHeader *hdr =
+				(__GLXdispatchTexSubImage3DHeader *) pc;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->imageHeight);
+    __GLX_SWAP_INT((GLbyte *)&hdr->imageDepth);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipImages);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipVolumes);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->level);
+    __GLX_SWAP_INT((GLbyte *)&hdr->xoffset);
+    __GLX_SWAP_INT((GLbyte *)&hdr->yoffset);
+    __GLX_SWAP_INT((GLbyte *)&hdr->zoffset);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->height);
+    __GLX_SWAP_INT((GLbyte *)&hdr->depth);
+    __GLX_SWAP_INT((GLbyte *)&hdr->size4d);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, hdr->imageHeight);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, hdr->skipImages);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glTexSubImage3D(hdr->target, hdr->level, hdr->xoffset, hdr->yoffset,
+		       hdr->zoffset, hdr->width, hdr->height, hdr->depth,
+		       hdr->format, hdr->type, (GLvoid *)(hdr+1));
+}
+
+void __glXDispSwap_ColorTable(GLbyte *pc)
+{
+    __GLXdispatchColorTableHeader *hdr =
+				(__GLXdispatchColorTableHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glColorTable(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDispSwap_ColorSubTable(GLbyte *pc)
+{
+    __GLXdispatchColorSubTableHeader *hdr =
+				(__GLXdispatchColorSubTableHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->start);
+    __GLX_SWAP_INT((GLbyte *)&hdr->count);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glColorSubTable(hdr->target, hdr->start, hdr->count, hdr->format,
+		    hdr->type, (GLvoid *)(hdr+1));
+}
+
+void __glXDispSwap_ConvolutionFilter1D(GLbyte *pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+				(__GLXdispatchConvolutionFilterHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glConvolutionFilter2D(hdr->target, hdr->internalformat,
+		 hdr->width, 1, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDispSwap_ConvolutionFilter2D(GLbyte *pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+				(__GLXdispatchConvolutionFilterHeader *) pc;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->height);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    glConvolutionFilter2D(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->height, hdr->format, hdr->type,
+		 (GLvoid *)(hdr+1));
+}
+
+void __glXDispSwap_SeparableFilter2D(GLbyte *pc)
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+				(__GLXdispatchConvolutionFilterHeader *) pc;
+    GLint hdrlen, image1len;
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->rowLength);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipRows);
+    __GLX_SWAP_INT((GLbyte *)&hdr->skipPixels);
+    __GLX_SWAP_INT((GLbyte *)&hdr->alignment);
+
+    __GLX_SWAP_INT((GLbyte *)&hdr->target);
+    __GLX_SWAP_INT((GLbyte *)&hdr->internalformat);
+    __GLX_SWAP_INT((GLbyte *)&hdr->width);
+    __GLX_SWAP_INT((GLbyte *)&hdr->height);
+    __GLX_SWAP_INT((GLbyte *)&hdr->format);
+    __GLX_SWAP_INT((GLbyte *)&hdr->type);
+
+    /*
+    ** Just invert swapBytes flag; the GL will figure out if it needs to swap
+    ** the pixel data.
+    */
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
+
+    /* XXX check this usage - internal code called
+    ** a version without the packing parameters
+    */
+    image1len = __glXImageSize(hdr->format, hdr->type, hdr->width, 1,
+			       hdr->rowLength, hdr->skipRows, hdr->alignment);
+    image1len = __GLX_PAD(image1len);
+
+
+    glSeparableFilter2D(hdr->target, hdr->internalformat,
+		 hdr->width, hdr->height, hdr->format, hdr->type,
+		 ((GLubyte *)hdr+hdrlen), ((GLubyte *)hdr+hdrlen+image1len));
+}
diff --git a/xc/programs/Xserver/GL/glx/rensize.c b/xc/programs/Xserver/GL/glx/rensize.c
index 484a16eab..30ae56005 100644
--- a/xc/programs/Xserver/GL/glx/rensize.c
+++ b/xc/programs/Xserver/GL/glx/rensize.c
@@ -1,28 +1,43 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.2 1999/06/14 07:31:34 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/rensize.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
-#include "glxserver.h"
 #include <GL/gl.h>
-#include <GL/glxproto.h>
+#include "glxserver.h"
+#include "GL/glxproto.h"
 #include "unpack.h"
 #include "impsize.h"
 
@@ -64,7 +79,7 @@ int __glXLightfvReqSize(GLbyte *pc, Bool swap )
     }
     return 4 * __glLightfv_size( pname );	/* defined in samplegl lib */
 }
-	   
+
 int __glXLightivReqSize(GLbyte *pc, Bool swap )
 {
     return __glXLightfvReqSize( pc, swap );
@@ -159,7 +174,7 @@ int __glXMap1dReqSize(GLbyte *pc, Bool swap )
 {
     GLenum target;
     GLint order, k;
-    
+
     target = *(GLenum*) (pc + 16);
     order = *(GLint*) (pc + 20);
     if (swap) {
@@ -174,8 +189,8 @@ int __glXMap1fReqSize(GLbyte *pc, Bool swap )
 {
     GLenum target;
     GLint order, k;
-    
-    target = *(GLenum *)(pc + 0); 
+
+    target = *(GLenum *)(pc + 0);
     order = *(GLint *)(pc + 12);
     if (swap) {
 	target = SWAPL( target );
@@ -195,7 +210,7 @@ int __glXMap2dReqSize(GLbyte *pc, Bool swap )
 {
     GLenum target;
     GLint uorder, vorder, k;
-    
+
     target = *(GLenum *)(pc + 32);
     uorder = *(GLint *)(pc + 36);
     vorder = *(GLint *)(pc + 40);
@@ -212,8 +227,8 @@ int __glXMap2fReqSize(GLbyte *pc, Bool swap )
 {
     GLenum target;
     GLint uorder, vorder, k;
-    
-    target = *(GLenum *)(pc + 0); 
+
+    target = *(GLenum *)(pc + 0);
     uorder = *(GLint *)(pc + 12);
     vorder = *(GLint *)(pc + 24);
     if (swap) {
@@ -250,19 +265,19 @@ int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap )
     return 2 * mapsize;
 }
 
-static int ImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
-		      GLint rowLength, GLint skipRows, GLint alignment )
+int __glXImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
+	       GLint rowLength, GLint skipRows, GLint alignment )
 {
     GLint bytesPerElement, elementsPerGroup, groupsPerRow;
     GLint groupSize, rowSize, padding;
-    
+
     if (w < 0 || h < 0 ||
 	(type == GL_BITMAP &&
 	 (format != GL_COLOR_INDEX && format != GL_STENCIL_INDEX))) {
 	return -1;
     }
     if (w==0 || h==0) return 0;
-    
+
     if (type == GL_BITMAP) {
 	if (rowLength > 0) {
 	    groupsPerRow = rowLength;
@@ -276,23 +291,117 @@ static int ImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
 	}
 	return ((h + skipRows) * rowSize);
     } else {
+	switch(format) {
+	  case GL_COLOR_INDEX:
+	  case GL_STENCIL_INDEX:
+	  case GL_DEPTH_COMPONENT:
+	    elementsPerGroup = 1;
+	    break;
+	  case GL_RED:
+	  case GL_GREEN:
+	  case GL_BLUE:
+	  case GL_ALPHA:
+	  case GL_LUMINANCE:
+	    elementsPerGroup = 1;
+	    break;
+	  case GL_LUMINANCE_ALPHA:
+	    elementsPerGroup = 2;
+	    break;
+	  case GL_RGB:
+	  case GL_BGR:
+	    elementsPerGroup = 3;
+	    break;
+	  case GL_RGBA:
+	  case GL_BGRA:
+	  case GL_ABGR_EXT:
+	    elementsPerGroup = 4;
+	    break;
+	  default:
+	    return -1;
+	}
 	switch(type) {
 	  case GL_UNSIGNED_BYTE:
 	  case GL_BYTE:
 	    bytesPerElement = 1;
 	    break;
+	  case GL_UNSIGNED_BYTE_3_3_2:
+	  case GL_UNSIGNED_BYTE_2_3_3_REV:
+	    bytesPerElement = 1;	    
+	    elementsPerGroup = 1;
+	    break;
 	  case GL_UNSIGNED_SHORT:
 	  case GL_SHORT:
 	    bytesPerElement = 2;
 	    break;
+	  case GL_UNSIGNED_SHORT_5_6_5:
+	  case GL_UNSIGNED_SHORT_5_6_5_REV:
+	  case GL_UNSIGNED_SHORT_4_4_4_4:
+ 	  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+	  case GL_UNSIGNED_SHORT_5_5_5_1:
+	  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+	    bytesPerElement = 2;
+	    elementsPerGroup = 1;
+	    break;
 	  case GL_INT:
 	  case GL_UNSIGNED_INT:
 	  case GL_FLOAT:
 	    bytesPerElement = 4;
 	    break;
+	  case GL_UNSIGNED_INT_8_8_8_8:
+	  case GL_UNSIGNED_INT_8_8_8_8_REV:
+	  case GL_UNSIGNED_INT_10_10_10_2:
+	  case GL_UNSIGNED_INT_2_10_10_10_REV:
+	    bytesPerElement = 4;
+	    elementsPerGroup = 1;
+	    break;
 	  default:
 	    return -1;
 	}
+	groupSize = bytesPerElement * elementsPerGroup;
+	if (rowLength > 0) {
+	    groupsPerRow = rowLength;
+	} else {
+	    groupsPerRow = w;
+	}
+	rowSize = groupsPerRow * groupSize;
+	padding = (rowSize % alignment);
+	if (padding) {
+	    rowSize += alignment - padding;
+	}
+	return ((h + skipRows) * rowSize);
+    }
+}
+
+/* XXX
+ * This should be folded into __glXImageSize().
+ */
+int __glXImage3DSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
+		      GLsizei d, GLint imageHeight, GLint rowLength,
+		      GLint skipImages, GLint skipRows, GLint alignment )
+{
+    GLint bytesPerElement, elementsPerGroup, groupsPerRow;
+    GLint groupSize, rowSize, padding, imageSize;
+
+    if (w < 0 || h < 0 || d < 0 ||
+	(type == GL_BITMAP &&
+	 (format != GL_COLOR_INDEX && format != GL_STENCIL_INDEX))) {
+	return -1;
+    }
+    if (w==0 || h==0 || d == 0) return 0;
+
+    if (type == GL_BITMAP) {
+	if (rowLength > 0) {
+	    groupsPerRow = rowLength;
+	} else {
+	    groupsPerRow = w;
+	}
+	rowSize = (groupsPerRow + 7) >> 3;
+	padding = (rowSize % alignment);
+	if (padding) {
+	    rowSize += alignment - padding;
+	}
+	return ((h + skipRows) * rowSize);
+    } else {
 	switch(format) {
 	  case GL_COLOR_INDEX:
 	  case GL_STENCIL_INDEX:
@@ -310,15 +419,55 @@ static int ImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
 	    elementsPerGroup = 2;
 	    break;
 	  case GL_RGB:
+	  case GL_BGR:
 	    elementsPerGroup = 3;
 	    break;
 	  case GL_RGBA:
+	  case GL_BGRA:
 	  case GL_ABGR_EXT:
 	    elementsPerGroup = 4;
 	    break;
 	  default:
 	    return -1;
 	}
+	switch(type) {
+	  case GL_UNSIGNED_BYTE:
+	  case GL_BYTE:
+	    bytesPerElement = 1;
+	    break;
+	  case GL_UNSIGNED_BYTE_3_3_2:
+	  case GL_UNSIGNED_BYTE_2_3_3_REV:
+	    bytesPerElement = 1;	    
+	    elementsPerGroup = 1;
+	    break;
+	  case GL_UNSIGNED_SHORT:
+	  case GL_SHORT:
+	    bytesPerElement = 2;
+	    break;
+	  case GL_UNSIGNED_SHORT_5_6_5:
+	  case GL_UNSIGNED_SHORT_5_6_5_REV:
+	  case GL_UNSIGNED_SHORT_4_4_4_4:
+ 	  case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+	  case GL_UNSIGNED_SHORT_5_5_5_1:
+	  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+	    bytesPerElement = 2;
+	    elementsPerGroup = 1;
+	    break;
+	  case GL_INT:
+	  case GL_UNSIGNED_INT:
+	  case GL_FLOAT:
+	    bytesPerElement = 4;
+	    break;
+	  case GL_UNSIGNED_INT_8_8_8_8:
+	  case GL_UNSIGNED_INT_8_8_8_8_REV:
+	  case GL_UNSIGNED_INT_10_10_10_2:
+	  case GL_UNSIGNED_INT_2_10_10_10_REV:
+	    bytesPerElement = 4;
+	    elementsPerGroup = 1;
+	    break;
+	  default:
+	    return -1;
+	}
 	groupSize = bytesPerElement * elementsPerGroup;
 	if (rowLength > 0) {
 	    groupsPerRow = rowLength;
@@ -330,10 +479,16 @@ static int ImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
 	if (padding) {
 	    rowSize += alignment - padding;
 	}
-	return ((h + skipRows) * rowSize);
+	if (imageHeight > 0) {
+	    imageSize = (imageHeight + skipRows) * rowSize;
+	} else {
+	    imageSize = (h + skipRows) * rowSize;
+	}
+	return ((d + skipImages) * imageSize);
     }
 }
 
+
 int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap )
 {
     __GLXdispatchDrawPixelsHeader *hdr = (__GLXdispatchDrawPixelsHeader *) pc;
@@ -350,11 +505,11 @@ int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap )
 	type = SWAPL( type );
 	w = SWAPL( w );
 	h = SWAPL( h );
- 	rowLength = SWAPL( rowLength );
+	rowLength = SWAPL( rowLength );
 	skipRows = SWAPL( skipRows );
 	alignment = SWAPL( alignment );
     }
-    return ImageSize( format, type, w, h, rowLength, skipRows, alignment );
+    return __glXImageSize( format, type, w, h, rowLength, skipRows, alignment );
 }
 
 int __glXBitmapReqSize(GLbyte *pc, Bool swap )
@@ -369,11 +524,11 @@ int __glXBitmapReqSize(GLbyte *pc, Bool swap )
     if (swap) {
 	w = SWAPL( w );
 	h = SWAPL( h );
- 	rowLength = SWAPL( rowLength );
+	rowLength = SWAPL( rowLength );
 	skipRows = SWAPL( skipRows );
 	alignment = SWAPL( alignment );
     }
-    return ImageSize( GL_COLOR_INDEX, GL_BITMAP, w, h,
+    return __glXImageSize( GL_COLOR_INDEX, GL_BITMAP, w, h,
 		      rowLength, skipRows, alignment );
 }
 
@@ -402,7 +557,7 @@ int __glXTexImage1DReqSize(GLbyte *pc, Bool swap )
     } else if (format == GL_STENCIL_INDEX || format == GL_DEPTH_COMPONENT) {
 	return -1;
     }
-    return ImageSize( format, type, w, 1, rowLength, skipRows, alignment );
+    return __glXImageSize( format, type, w, 1, rowLength, skipRows, alignment );
 }
 
 int __glXTexImage2DReqSize(GLbyte *pc, Bool swap )
@@ -432,20 +587,21 @@ int __glXTexImage2DReqSize(GLbyte *pc, Bool swap )
     } else if (format == GL_STENCIL_INDEX || format == GL_DEPTH_COMPONENT) {
 	return -1;
     }
-    return ImageSize( format, type, w, h, rowLength, skipRows, alignment );
+    return __glXImageSize( format, type, w, h, rowLength, skipRows, alignment );
 }
 
+/* XXX this is used elsewhere - should it be exported from glxserver.h? */
 int __glXTypeSize(GLenum enm)
 {
   switch(enm) {
-    case GL_BYTE: 		return sizeof(GLbyte); 	
-    case GL_UNSIGNED_BYTE: 	return sizeof(GLubyte);
-    case GL_SHORT: 		return sizeof(GLshort); 	
-    case GL_UNSIGNED_SHORT: 	return sizeof(GLushort);
-    case GL_INT: 		return sizeof(GLint); 		
-    case GL_UNSIGNED_INT: 	return sizeof(GLint);
-    case GL_FLOAT: 		return sizeof(GLfloat);
-    case GL_DOUBLE:	 	return sizeof(GLdouble);
+    case GL_BYTE:		return sizeof(GLbyte);
+    case GL_UNSIGNED_BYTE:	return sizeof(GLubyte);
+    case GL_SHORT:		return sizeof(GLshort);
+    case GL_UNSIGNED_SHORT:	return sizeof(GLushort);
+    case GL_INT:		return sizeof(GLint);
+    case GL_UNSIGNED_INT:	return sizeof(GLint);
+    case GL_FLOAT:		return sizeof(GLfloat);
+    case GL_DOUBLE:		return sizeof(GLdouble);
     default:			return -1;
   }
 }
@@ -478,32 +634,32 @@ int __glXDrawArraysSize( GLbyte *pc, Bool swap )
 	    component = SWAPL( component );
 	}
 
-        switch (component) {
-          case GL_VERTEX_ARRAY:
-          case GL_COLOR_ARRAY:
-          case GL_TEXTURE_COORD_ARRAY:
-            break;
-          case GL_NORMAL_ARRAY:
-            if (numVals != 3) {
+	switch (component) {
+	  case GL_VERTEX_ARRAY:
+	  case GL_COLOR_ARRAY:
+	  case GL_TEXTURE_COORD_ARRAY:
+	    break;
+	  case GL_NORMAL_ARRAY:
+	    if (numVals != 3) {
 		/* bad size */
-                return -1;
-            }
+		return -1;
+	    }
 	    break;
-          case GL_INDEX_ARRAY:
-            if (numVals != 1) {
+	  case GL_INDEX_ARRAY:
+	    if (numVals != 1) {
 		/* bad size */
-                return -1;
-            }
-            break;
-          case GL_EDGE_FLAG_ARRAY:
-            if ((numVals != 1) && (datatype != GL_UNSIGNED_BYTE)) {
+		return -1;
+	    }
+	    break;
+	  case GL_EDGE_FLAG_ARRAY:
+	    if ((numVals != 1) && (datatype != GL_UNSIGNED_BYTE)) {
 		/* bad size or bad type */
 		return -1;
-            }
-            break;
-          default:
-            /* unknown component type */
-            return -1;
+	    }
+	    break;
+	  default:
+	    /* unknown component type */
+	    return -1;
 	}
 
 	arrayElementSize += __GLX_PAD(numVals * __glXTypeSize(datatype));
@@ -512,7 +668,7 @@ int __glXDrawArraysSize( GLbyte *pc, Bool swap )
     }
 
     return ((numComponents * sizeof(__GLXdispatchDrawArraysComponentHeader)) +
-            (numVertexes * arrayElementSize));
+	    (numVertexes * arrayElementSize));
 }
 
 int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap )
@@ -541,7 +697,7 @@ int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap )
 	skipRows = SWAPL( skipRows );
 	alignment = SWAPL( alignment );
     }
-    return ImageSize( format, type, w, 1, rowLength, skipRows, alignment );
+    return __glXImageSize( format, type, w, 1, rowLength, skipRows, alignment );
 }
 
 int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap )
@@ -565,5 +721,280 @@ int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap )
 	skipRows = SWAPL( skipRows );
 	alignment = SWAPL( alignment );
     }
-    return ImageSize( format, type, w, h, rowLength, skipRows, alignment );
+    return __glXImageSize( format, type, w, h, rowLength, skipRows, alignment );
+}
+
+int __glXTexImage3DReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchTexImage3DHeader *hdr = (__GLXdispatchTexImage3DHeader *) pc;
+    GLenum target = hdr->target;
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint h = hdr->height;
+    GLint d = hdr->depth;
+    GLint imageHeight = hdr->imageHeight;
+    GLint rowLength = hdr->rowLength;
+    GLint skipImages = hdr->skipImages;
+    GLint skipRows = hdr->skipRows;
+    GLint alignment = hdr->alignment;
+    GLint nullImage = hdr->nullimage;
+
+    if (swap) {
+	target = SWAPL( target );
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	h = SWAPL( h );
+	d = SWAPL( d );
+	imageHeight = SWAPL( imageHeight );
+	rowLength = SWAPL( rowLength );
+	skipImages = SWAPL( skipImages );
+	skipRows = SWAPL( skipRows );
+	alignment = SWAPL( alignment );
+    }
+    if (target == GL_PROXY_TEXTURE_3D || nullImage) {
+	return 0;
+    } else {
+	return __glXImage3DSize( format, type, w, h, d, imageHeight,
+				 rowLength, skipImages, skipRows,
+				 alignment);
+    }
+}
+
+int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchTexSubImage3DHeader *hdr =
+					(__GLXdispatchTexSubImage3DHeader *) pc;
+    GLenum target = hdr->target;
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint h = hdr->height;
+    GLint d = hdr->depth;
+    GLint imageHeight = hdr->imageHeight;
+    GLint rowLength = hdr->rowLength;
+    GLint skipImages = hdr->skipImages;
+    GLint skipRows = hdr->skipRows;
+    GLint alignment = hdr->alignment;
+
+    if (swap) {
+	target = SWAPL( target );
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	h = SWAPL( h );
+	d = SWAPL( d );
+	imageHeight = SWAPL( imageHeight );
+	rowLength = SWAPL( rowLength );
+	skipImages = SWAPL( skipImages );
+	skipRows = SWAPL( skipRows );
+	alignment = SWAPL( alignment );
+    }
+    if (target == GL_PROXY_TEXTURE_3D) {
+	return 0;
+    } else {
+	return __glXImage3DSize( format, type, w, h, d, imageHeight,
+				 rowLength, skipImages, skipRows,
+				 alignment);
+    }
+}
+
+int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+			(__GLXdispatchConvolutionFilterHeader *) pc;
+
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint rowLength = hdr->rowLength;
+    GLint alignment = hdr->alignment;
+
+    if (swap) {
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	rowLength = SWAPL( rowLength );
+	alignment = SWAPL( alignment );
+    }
+
+    return __glXImageSize ( format, type, w, 1, rowLength, 0, alignment );
+}
+
+int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+			(__GLXdispatchConvolutionFilterHeader *) pc;
+
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint h = hdr->height;
+    GLint rowLength = hdr->rowLength;
+    GLint skipRows = hdr->skipRows;
+    GLint alignment = hdr->alignment;
+
+    if (swap) {
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	h = SWAPL( h );
+	rowLength = SWAPL( rowLength );
+	skipRows = SWAPL( skipRows );
+	alignment = SWAPL( alignment );
+    }
+
+    return __glXImageSize ( format, type, w, h, rowLength, skipRows, alignment );
+}
+
+int __glXConvolutionParameterivSize(GLenum pname)
+{
+    switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+      case GL_CONVOLUTION_FILTER_SCALE:
+      case GL_CONVOLUTION_FILTER_BIAS:
+	return 4;
+      case GL_CONVOLUTION_BORDER_MODE:
+	return 1;
+      default:
+	return -1;
+    }
+}
+
+int __glXConvolutionParameterfvSize(GLenum pname)
+{
+    return __glXConvolutionParameterivSize(pname);
+}
+
+int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap )
+{
+    GLenum pname = *(GLenum *)(pc + 4);
+    if (swap) {
+	pname = SWAPL( pname );
+    }
+    return 4 * __glXConvolutionParameterivSize( pname );
+}
+
+int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap )
+{
+    return __glXConvolutionParameterivReqSize( pc, swap );
+}
+
+int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchConvolutionFilterHeader *hdr =
+			(__GLXdispatchConvolutionFilterHeader *) pc;
+
+    GLint image1size, image2size;
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint h = hdr->height;
+    GLint rowLength = hdr->rowLength;
+    GLint alignment = hdr->alignment;
+
+    if (swap) {
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	h = SWAPL( h );
+	rowLength = SWAPL( rowLength );
+	alignment = SWAPL( alignment );
+    }
+
+    /* XXX Should rowLength be used for either or both image? */
+    image1size = __glXImageSize ( format, type, w, 1, rowLength, 0, alignment );
+    image1size = __GLX_PAD(image1size);
+    image2size = __glXImageSize ( format, type, h, 1, rowLength, 0, alignment );
+    return image1size + image2size;
+
+}
+
+int __glXColorTableParameterfvSize(GLenum pname)
+{
+    /* currently, only scale and bias are supported; return RGBA */
+    switch(pname) {
+    case GL_COLOR_TABLE_SCALE:
+    case GL_COLOR_TABLE_BIAS:
+	return 4;
+    default:
+	return 0;
+    }
+}
+
+int __glXColorTableParameterivSize(GLenum pname)
+{
+    /* fv and iv are the same in this context */
+    return __glXColorTableParameterfvSize(pname);
+}
+
+int __glXColorTableReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchColorTableHeader *hdr =
+			(__GLXdispatchColorTableHeader *) pc;
+
+    GLenum target = hdr->target;
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint w = hdr->width;
+    GLint rowLength = hdr->rowLength;
+    GLint alignment = hdr->alignment;
+
+    switch (target) {
+      case GL_PROXY_TEXTURE_1D:
+      case GL_PROXY_TEXTURE_2D:
+      case GL_PROXY_TEXTURE_3D:
+      case GL_PROXY_COLOR_TABLE:
+      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
+      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+          return 0;
+    }
+
+    if (swap) {
+	format = SWAPL( format );
+	type = SWAPL( type );
+	w = SWAPL( w );
+	rowLength = SWAPL( rowLength );
+	alignment = SWAPL( alignment );
+    }
+
+    return __glXImageSize ( format, type, w, 1, rowLength, 0, alignment );
+}
+
+int __glXColorSubTableReqSize(GLbyte *pc, Bool swap )
+{
+    __GLXdispatchColorSubTableHeader *hdr =
+			(__GLXdispatchColorSubTableHeader *) pc;
+
+    GLenum format = hdr->format;
+    GLenum type = hdr->type;
+    GLint count = hdr->count;
+    GLint rowLength = hdr->rowLength;
+    GLint alignment = hdr->alignment;
+
+    if (swap) {
+	format = SWAPL( format );
+	type = SWAPL( type );
+	count = SWAPL( count );
+	rowLength = SWAPL( rowLength );
+	alignment = SWAPL( alignment );
+    }
+
+    return __glXImageSize ( format, type, count, 1, rowLength, 0, alignment );
+}
+
+int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap )
+{
+    GLenum pname = *(GLenum *)(pc + 4);
+    if (swap) {
+	pname = SWAPL( pname );
+    }
+    return 4 * __glXColorTableParameterfvSize(pname);
+}
+
+int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap )
+{
+    /* no difference between fv and iv versions */
+    return __glXColorTableParameterfvReqSize(pc, swap);
 }
diff --git a/xc/programs/Xserver/GL/glx/rensizetab.c b/xc/programs/Xserver/GL/glx/rensizetab.c
index 229fa3c30..d27c39ea9 100644
--- a/xc/programs/Xserver/GL/glx/rensizetab.c
+++ b/xc/programs/Xserver/GL/glx/rensizetab.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.2 1999/06/14 07:31:34 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/rensizetab.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #include "glxserver.h"
@@ -216,14 +231,2058 @@ __GLXrenderSizeData __glXRenderSizeTable[] = {
 	/* Translatef          */	{  16, 	0                         },
 	/* Viewport            */	{  20, 	0                         },
 	/* PolygonOffset       */	{  12, 	0                         },
-	/* DrawArrays          */	{  16, 	__glXDrawArraysSize       },
+	/* no such opcode      */	{  0, 	0                         },
 	/* Indexubv            */	{  8, 	0                         },
+        /* ColorSubTable       */       {  44,  __glXColorSubTableReqSize         },
+        /* CopyColorSubTable   */       {  24,  0                         },
+        /* ActiveTextureARB    */       {  8,   0                         },
+        /* MultiTexCoord1dvARB */       {  16,  0                         },
+        /* MultiTexCoord1fvARB */       {  12,  0                         },
+        /* MultiTexCoord1ivARB */       {  12,  0                         },
+        /* MultiTexCoord1svARB */       {  12,  0                         },
+        /* MultiTexCoord2dvARB */       {  24,  0                         },
+        /* MultiTexCoord2fvARB */       {  16,  0                         },
+        /* MultiTexCoord2ivARB */       {  16,  0                         },
+        /* MultiTexCoord2svARB */       {  12,  0                         },
+        /* MultiTexCoord3dvARB */       {  32,  0                         },
+        /* MultiTexCoord3fvARB */       {  20,  0                         },
+        /* MultiTexCoord3ivARB */       {  20,  0                         },
+        /* MultiTexCoord3svARB */       {  16,  0                         },
+        /* MultiTexCoord4dvARB */       {  40,  0                         },
+        /* MultiTexCoord4fvARB */       {  24,  0                         },
+        /* MultiTexCoord4ivARB */       {  24,  0                         },
+        /* MultiTexCoord4svARB */       {  16,  0                         },
 };
 __GLXrenderSizeData __glXRenderSizeTable_EXT[] = {
-	/* PolygonOffset       */	{  12, 	0                         },
-	/* TexSubImage1D       */	{  60, 	__glXTexSubImage1DReqSize },
-	/* TexSubImage2D       */	{  60, 	__glXTexSubImage2DReqSize },
-	/* no such opcode      */	{   0, 	0                         },
+        /* ColorTable          */       {  44,  __glXColorTableReqSize    },
+        /* ColorTableParameterfv */     {  12,  __glXColorTableParameterfvReqSize         },
+        /* ColorTableParameteriv */     {  12,  __glXColorTableParameterivReqSize         },
+        /* CopyColorTable      */       {  24,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
+        /* no such opcode      */       {   0,  0                         },
 	/* no such opcode      */	{   0, 	0                         },
 	/* no such opcode      */	{   0, 	0                         },
 	/* no such opcode      */	{   0, 	0                         },
@@ -238,11 +2297,32 @@ __GLXrenderSizeData __glXRenderSizeTable_EXT[] = {
 	/* no such opcode      */	{   0, 	0                         },
 	/* no such opcode      */	{   0, 	0                         },
 	/* no such opcode      */	{   0, 	0                         },
+        /* BlendColor          */       {  20,  0                         },
+        /* BlendEquation       */       {   8,  0                         },
 	/* no such opcode      */	{   0, 	0                         },
+        /* TexSubImage1D       */       {  60,  __glXTexSubImage1DReqSize },
+        /* TexSubImage2D       */       {  60,  __glXTexSubImage2DReqSize },
+        /* ConvolutionFilter1D */       {  48,  __glXConvolutionFilter1DReqSize },
+        /* ConvolutionFilter2D     */   {  48,  __glXConvolutionFilter2DReqSize },
+        /* ConvolutionParameterf   */   {  16,  0                         },
+        /* ConvolutionParameterfv  */   {  12,  __glXConvolutionParameterfvReqSize },
+        /* ConvolutionParameteri   */   {  16,  0                         },
+        /* ConvolutionParameteriv  */   {  12,  __glXConvolutionParameterivReqSize },
+        /* CopyConvolutionFilter1D */   {  24,                            },
+        /* CopyConvolutionFilter2D */   {  28,                            },
+        /* SeparableFilter2D   */       {  48,  __glXSeparableFilter2DReqSize },
+        /* Histogram           */       {  20,                            },
+        /* Minmax              */       {  16,                            },
+        /* ResetHistogram      */       {  8,                             },
+        /* ResetMinmax         */       {  8,                             },
+        /* TexImage3D          */       {  84,  __glXTexImage3DReqSize    },
+        /* TexSubImage3D       */       {  92,  __glXTexSubImage3DReqSize },
+	/* DrawArrays          */	{  16, 	__glXDrawArraysSize       },
 	/* BindTexture         */	{  12, 	0                         },
 	/* PrioritizeTextures  */	{   8, 	__glXPrioritizeTexturesReqSize },
 	/* CopyTexImage1D      */	{  32, 	0 },
 	/* CopyTexImage2D      */	{  36, 	0 },
 	/* CopyTexSubImage1D   */	{  28, 	0 },
 	/* CopyTexSubImage2D   */	{  36, 	0 },
+        /* CopyTexSubImage3D   */       {  40,  0 },
 };
diff --git a/xc/programs/Xserver/GL/glx/single2.c b/xc/programs/Xserver/GL/glx/single2.c
index d62c22a1b..ac4b85398 100644
--- a/xc/programs/Xserver/GL/glx/single2.c
+++ b/xc/programs/Xserver/GL/glx/single2.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/single2.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -26,6 +41,7 @@
 #include "glxext.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "GL/glx_ansic.h"
 
 int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
@@ -186,7 +202,6 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
 int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
 {
 	__GLXcontext *cx;
-	ClientPtr client = cl->client;
 	int error;
 
 	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -282,10 +297,9 @@ int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc)
     __GLXcontext *cx;
     GLenum name;
     const char *string;
-    GLint length;
     int error;
-    GLubyte *answer;
-    char *buf;
+    char *buf = NULL, *buf1 = NULL;
+    GLint length = 0;
 
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
     if (!cx) {
@@ -297,26 +311,32 @@ int __glXDisp_GetString(__GLXclientState *cl, GLbyte *pc)
     string = (const char *)glGetString(name);
     client = cl->client;
 
-    if ((name == GL_EXTENSIONS) && (cl->GLClientextensions)) {
-	buf = __glXcombine_strings(string,
+    /*
+    ** Restrict extensions to those that are supported by both the
+    ** implementation and the connection.  That is, return the
+    ** intersection of client, server, and core extension strings.
+    */
+    if (name == GL_EXTENSIONS) {
+	buf1 = __glXcombine_strings(string,
 				      cl->GLClientextensions);
-    } else {
-	buf = __glXMalloc(__glXStrlen(string) + 2);
-	__glXStrcpy(buf, string);
+	buf = __glXcombine_strings(buf1,
+				      cx->pGlxScreen->GLextensions);
+	if (buf1 != NULL) {
+	    __glXFree(buf1);
+	}
+	string = buf;
     }
-    if (!buf) {
-	length = 0;
-	__GLX_BEGIN_REPLY(0);
-	__GLX_PUT_SIZE(0);
-    } else {
-	length = __glXStrlen((const char *) buf) + 1;
-	__GLX_BEGIN_REPLY(length);
-	__GLX_PUT_SIZE(length);
+    if (string) {
+	length = __glXStrlen((const char *) string) + 1;
     }
 
+    __GLX_BEGIN_REPLY(length);
+    __GLX_PUT_SIZE(length);
     __GLX_SEND_HEADER();
-    WriteToClient(client, length, buf); 
-    __glXFree(buf);
+    WriteToClient(client, length, (char *) string); 
+    if (buf != NULL) {
+	__glXFree(buf);
+    }
     return Success;
 }
 
diff --git a/xc/programs/Xserver/GL/glx/single2swap.c b/xc/programs/Xserver/GL/glx/single2swap.c
index 3aa1af0f7..c3d67095f 100644
--- a/xc/programs/Xserver/GL/glx/single2swap.c
+++ b/xc/programs/Xserver/GL/glx/single2swap.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/single2swap.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -26,6 +41,7 @@
 #include "glxext.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "GL/glx_ansic.h"
 
 int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
@@ -251,11 +267,11 @@ int __glXDispSwap_GetString(__GLXclientState *cl, GLbyte *pc)
     __GLXcontext *cx;
     GLenum name;
     const char *string;
-    GLint length;
     __GLX_DECLARE_SWAP_VARIABLES;
     int error;
     GLubyte *answer;
-    char *buf;
+    char *buf = NULL, *buf1 = NULL;
+    GLint length = 0;
 
     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -269,28 +285,35 @@ int __glXDispSwap_GetString(__GLXclientState *cl, GLbyte *pc)
     string = (const char *)glGetString(name);
     client = cl->client;
 
-    if ((name == GL_EXTENSIONS) && (cl->GLClientextensions)) {
-	buf = __glXcombine_strings(string,
+    /*
+    ** Restrict extensions to those that are supported by both the
+    ** implementation and the connection.  That is, return the
+    ** intersection of client, server, and core extension strings.
+    */
+    if (name == GL_EXTENSIONS) {
+	buf1 = __glXcombine_strings(string,
 				      cl->GLClientextensions);
-    } else {
-	buf = __glXMalloc(__glXStrlen(string) + 2);
-	__glXStrcpy(buf, string);
+	buf = __glXcombine_strings(buf1,
+				      cx->pGlxScreen->GLextensions);
+	if (buf1 != NULL) {
+	    __glXFree(buf1);
+	}
+	string = buf;
     }
-    if (!buf) {
-	length = 0;
-	__GLX_BEGIN_REPLY(0);
- 	__GLX_PUT_SIZE(0);
-    } else {
-	length = __glXStrlen((const char *) buf) + 1;
-	__GLX_BEGIN_REPLY(length);
-	__GLX_PUT_SIZE(length);
+    if (string) {
+	length = __glXStrlen((const char *) string) + 1;
     }
-    
+
+    __GLX_BEGIN_REPLY(length);
+    __GLX_PUT_SIZE(length);
+
     __GLX_SWAP_REPLY_SIZE();
     __GLX_SWAP_REPLY_HEADER();
     __GLX_SEND_HEADER();
-    WriteToClient(client, length, buf); 
-    __glXFree(buf);
+    WriteToClient(client, length, (char *) string); 
+    if (buf != NULL) {
+	__glXFree(buf);
+    }
 
     return Success;
 }
diff --git a/xc/programs/Xserver/GL/glx/singlepix.c b/xc/programs/Xserver/GL/glx/singlepix.c
index 830bdd50c..82bc3a476 100644
--- a/xc/programs/Xserver/GL/glx/singlepix.c
+++ b/xc/programs/Xserver/GL/glx/singlepix.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlepix.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -26,6 +41,7 @@
 #include "singlesize.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {
@@ -57,7 +73,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
     glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    glReadPixels( 
+    glReadPixels(
 		 *(GLint    *)(pc + 0),
 		 *(GLint    *)(pc + 4),
 		 *(GLsizei  *)(pc + 8),
@@ -87,7 +103,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
     ClientPtr client = cl->client;
     int error;
     char *answer, answerBuffer[200];
-    GLint width=0, height=0;
+    GLint width=0, height=0, depth=1;
 
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
     if (!cx) {
@@ -100,20 +116,23 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
     type = *(GLenum *)(pc + 12);
     target = *(GLenum *)(pc + 0);
     swapBytes = *(GLboolean *)(pc + 16);
-    
+
     glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
     glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
+    if ( target == GL_TEXTURE_3D) {
+	glGetTexLevelParameteriv(target, level, GL_TEXTURE_DEPTH, &depth);
+    }
     /*
-     * The two queries above might fail if we're in a state where queries
-     * are illegal, but then width and height would still be zero anyway.
+     * The three queries above might fail if we're in a state where queries
+     * are illegal, but then width, height, and depth would still be zero anyway.
      */
-    compsize = __glGetTexImage_size(target,level,format,type,width,height);
+    compsize = __glGetTexImage_size(target,level,format,type,width,height,depth);
     if (compsize < 0) compsize = 0;
-    
+
     glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    glGetTexImage( 
+    glGetTexImage(
 		  *(GLenum   *)(pc + 0),
 		  *(GLint    *)(pc + 4),
 		  *(GLenum   *)(pc + 8),
@@ -128,6 +147,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
 	__GLX_BEGIN_REPLY(compsize);
 	((xGLXGetTexImageReply *)&__glXReply)->width = width;
 	((xGLXGetTexImageReply *)&__glXReply)->height = height;
+	((xGLXGetTexImageReply *)&__glXReply)->depth = depth;
 	__GLX_SEND_HEADER();
 	__GLX_SEND_VOID_ARRAY(compsize);
     }
@@ -147,17 +167,18 @@ int __glXDisp_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
     if (!cx) {
 	return error;
     }
+
     pc += __GLX_SINGLE_HDR_SIZE;
     lsbFirst = *(GLboolean *)(pc + 0);
 
     glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer,cl,128,1);
-    
+
     __glXClearErrorOccured();
-    glGetPolygonStipple( 
+    glGetPolygonStipple(
 			(GLubyte  *) answer
 			);
-    
+
     if (__glXErrorOccured()) {
 	__GLX_BEGIN_REPLY(0);
 	__GLX_SEND_HEADER();
@@ -169,4 +190,270 @@ int __glXDisp_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
     return Success;
 }
 
+int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize, compsize2;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    char *answer, answerBuffer[200];
+    GLint width=0, height=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    /* target must be SEPARABLE_2D, however I guess we can let the GL
+       barf on this one.... */
+
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
+    /*
+     * The two queries above might fail if we're in a state where queries
+     * are illegal, but then width and height would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
+
+    if (compsize < 0) compsize = 0;
+    if (compsize2 < 0) compsize2 = 0;
+    compsize = __GLX_PAD(compsize);
+    compsize2 = __GLX_PAD(compsize2);
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize + compsize2,1);
+    __glXClearErrorOccured();
+    glGetSeparableFilter(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer,
+		  answer + compsize,
+		  NULL
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize + compsize2);
+	((xGLXGetSeparableFilterReply *)&__glXReply)->width = width;
+	((xGLXGetSeparableFilterReply *)&__glXReply)->height = height;
+	__GLX_SEND_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize + compsize2);
+    }
+
+    return Success;
+}
+
+int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    char *answer, answerBuffer[200];
+    GLint width=0, height=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    if (target == GL_CONVOLUTION_1D) {
+        height = 1;
+    } else {
+	glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
+    }
+    /*
+     * The two queries above might fail if we're in a state where queries
+     * are illegal, but then width and height would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,height,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetConvolutionFilter(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	((xGLXGetConvolutionFilterReply *)&__glXReply)->width = width;
+	((xGLXGetConvolutionFilterReply *)&__glXReply)->height = height;
+	__GLX_SEND_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
 
+    return Success;
+}
+
+int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes, reset;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    char *answer, answerBuffer[200];
+    GLint width=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+    reset = *(GLboolean *)(pc + 13);
+
+    glGetHistogramParameteriv(target, GL_HISTOGRAM_WIDTH, &width);
+    /*
+     * The one query above might fail if we're in a state where queries
+     * are illegal, but then width would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetHistogram( target, reset, format, type, answer);
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	((xGLXGetHistogramReply *)&__glXReply)->width = width;
+	__GLX_SEND_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
+
+int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes, reset;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    char *answer, answerBuffer[200];
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+    reset = *(GLboolean *)(pc + 13);
+
+    compsize = __glGetTexImage_size(target,1,format,type,2,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetMinmax( target, reset, format, type, answer);
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	__GLX_SEND_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
+
+int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    char *answer, answerBuffer[200];
+    GLint width=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    target = *(GLenum *)(pc + 0);
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    glGetColorTableParameteriv(target, GL_COLOR_TABLE_WIDTH, &width);
+    /*
+     * The one query above might fail if we're in a state where queries
+     * are illegal, but then width would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetColorTable(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SEND_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	((xGLXGetColorTableReply *)&__glXReply)->width = width;
+	__GLX_SEND_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
diff --git a/xc/programs/Xserver/GL/glx/singlepixswap.c b/xc/programs/Xserver/GL/glx/singlepixswap.c
index 39ca57ef4..dedcd38a7 100644
--- a/xc/programs/Xserver/GL/glx/singlepixswap.c
+++ b/xc/programs/Xserver/GL/glx/singlepixswap.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
@@ -26,6 +41,7 @@
 #include "singlesize.h"
 #include "unpack.h"
 #include "g_disptab.h"
+#include "g_disptab_EXT.h"
 
 int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {
@@ -66,7 +82,7 @@ int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
     glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    glReadPixels( 
+    glReadPixels(
 		 *(GLint    *)(pc + 0),
 		 *(GLint    *)(pc + 4),
 		 *(GLsizei  *)(pc + 8),
@@ -99,7 +115,7 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
     ClientPtr client = cl->client;
     int error;
     char *answer, answerBuffer[200];
-    GLint width=0, height=0;
+    GLint width=0, height=0, depth=1;
 
     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -121,17 +137,20 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
 
     glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
     glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
+    if ( target == GL_TEXTURE_3D) {
+	glGetTexLevelParameteriv(target, level, GL_TEXTURE_DEPTH, &depth);
+    }
     /*
-     * The two queries above might fail if we're in a state where queries
-     * are illegal, but then width and height would still be zero anyway.
+     * The three queries above might fail if we're in a state where queries
+     * are illegal, but then width, height, and depth would still be zero anyway.
      */
-    compsize = __glGetTexImage_size(target,level,format,type,width,height);
+    compsize = __glGetTexImage_size(target,level,format,type,width,height,depth);
     if (compsize < 0) compsize = 0;
-    
+
     glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
     __glXClearErrorOccured();
-    glGetTexImage( 
+    glGetTexImage(
 		  *(GLenum   *)(pc + 0),
 		  *(GLint    *)(pc + 4),
 		  *(GLenum   *)(pc + 8),
@@ -148,8 +167,10 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
 	__GLX_SWAP_REPLY_HEADER();
 	__GLX_SWAP_INT(&width);
 	__GLX_SWAP_INT(&height);
+	__GLX_SWAP_INT(&depth);
 	((xGLXGetTexImageReply *)&__glXReply)->width = width;
 	((xGLXGetTexImageReply *)&__glXReply)->height = height;
+	((xGLXGetTexImageReply *)&__glXReply)->depth = depth;
 	__GLX_SEND_HEADER();
 	__GLX_SEND_VOID_ARRAY(compsize);
     }
@@ -176,9 +197,9 @@ int __glXDispSwap_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
 
     glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer,cl,128,1);
-    
+
     __glXClearErrorOccured();
-    glGetPolygonStipple( 
+    glGetPolygonStipple(
 			(GLubyte  *) answer
 			);
     if (__glXErrorOccured()) {
@@ -193,3 +214,302 @@ int __glXDispSwap_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
     }
     return Success;
 }
+
+int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize, compsize2;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    char *answer, answerBuffer[200];
+    GLint width=0, height=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    __GLX_SWAP_INT(pc+0);
+    __GLX_SWAP_INT(pc+4);
+    __GLX_SWAP_INT(pc+8);
+
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    /* target must be SEPARABLE_2D, however I guess we can let the GL
+       barf on this one.... */
+
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
+    /*
+     * The two queries above might fail if we're in a state where queries
+     * are illegal, but then width and height would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
+
+    if (compsize < 0) compsize = 0;
+    if (compsize2 < 0) compsize2 = 0;
+    compsize = __GLX_PAD(compsize);
+    compsize2 = __GLX_PAD(compsize2);
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize + compsize2,1);
+    __glXClearErrorOccured();
+    glGetSeparableFilter(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer,
+		  answer + compsize,
+		  NULL
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize + compsize2);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SWAP_INT(&width);
+	__GLX_SWAP_INT(&height);
+	((xGLXGetSeparableFilterReply *)&__glXReply)->width = width;
+	((xGLXGetSeparableFilterReply *)&__glXReply)->height = height;
+	__GLX_SEND_VOID_ARRAY(compsize + compsize2);
+    }
+
+    return Success;
+}
+
+int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    char *answer, answerBuffer[200];
+    GLint width=0, height=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    __GLX_SWAP_INT(pc+0);
+    __GLX_SWAP_INT(pc+4);
+    __GLX_SWAP_INT(pc+8);
+
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    if (target == GL_CONVOLUTION_2D) {
+        height = 1;
+    } else {
+	glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
+    }
+    /*
+     * The two queries above might fail if we're in a state where queries
+     * are illegal, but then width and height would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,height,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetConvolutionFilter(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SWAP_INT(&width);
+	__GLX_SWAP_INT(&height);
+	((xGLXGetConvolutionFilterReply *)&__glXReply)->width = width;
+	((xGLXGetConvolutionFilterReply *)&__glXReply)->height = height;
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
+
+int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes, reset;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    char *answer, answerBuffer[200];
+    GLint width=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    __GLX_SWAP_INT(pc+0);
+    __GLX_SWAP_INT(pc+4);
+    __GLX_SWAP_INT(pc+8);
+
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+    reset = *(GLboolean *)(pc + 13);
+
+    glGetHistogramParameteriv(target, GL_HISTOGRAM_WIDTH, &width);
+    /*
+     * The one query above might fail if we're in a state where queries
+     * are illegal, but then width would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetHistogram( target, reset, format, type, answer);
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SWAP_INT(&width);
+	((xGLXGetHistogramReply *)&__glXReply)->width = width;
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
+
+int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes, reset;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    char *answer, answerBuffer[200];
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    __GLX_SWAP_INT(pc+0);
+    __GLX_SWAP_INT(pc+4);
+    __GLX_SWAP_INT(pc+8);
+
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+    reset = *(GLboolean *)(pc + 13);
+
+    compsize = __glGetTexImage_size(target,1,format,type,2,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetMinmax( target, reset, format, type, answer);
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
+
+int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+{
+    GLint compsize;
+    GLenum format, type, target;
+    GLboolean swapBytes;
+    __GLXcontext *cx;
+    ClientPtr client = cl->client;
+    int error;
+    __GLX_DECLARE_SWAP_VARIABLES;
+    char *answer, answerBuffer[200];
+    GLint width=0;
+
+    cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+    if (!cx) {
+	return error;
+    }
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    __GLX_SWAP_INT(pc+0);
+    __GLX_SWAP_INT(pc+4);
+    __GLX_SWAP_INT(pc+8);
+
+    format = *(GLenum *)(pc + 4);
+    type = *(GLenum *)(pc + 8);
+    target = *(GLenum *)(pc + 0);
+    swapBytes = *(GLboolean *)(pc + 12);
+
+    glGetColorTableParameteriv(target, GL_COLOR_TABLE_WIDTH, &width);
+    /*
+     * The one query above might fail if we're in a state where queries
+     * are illegal, but then width would still be zero anyway.
+     */
+    compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+    if (compsize < 0) compsize = 0;
+
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1);
+    __glXClearErrorOccured();
+    glGetColorTable(
+		  *(GLenum   *)(pc + 0),
+		  *(GLenum   *)(pc + 4),
+		  *(GLenum   *)(pc + 8),
+		  answer
+		  );
+
+    if (__glXErrorOccured()) {
+	__GLX_BEGIN_REPLY(0);
+	__GLX_SWAP_REPLY_HEADER();
+    } else {
+	__GLX_BEGIN_REPLY(compsize);
+	__GLX_SWAP_REPLY_HEADER();
+	__GLX_SWAP_INT(&width);
+	((xGLXGetColorTableReply *)&__glXReply)->width = width;
+	__GLX_SEND_VOID_ARRAY(compsize);
+    }
+
+    return Success;
+}
diff --git a/xc/programs/Xserver/GL/glx/singlesize.c b/xc/programs/Xserver/GL/glx/singlesize.c
index 1cff4c3a7..1deeb6d04 100644
--- a/xc/programs/Xserver/GL/glx/singlesize.c
+++ b/xc/programs/Xserver/GL/glx/singlesize.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.2 1999/06/14 07:31:35 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlesize.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #include <GL/gl.h>
@@ -34,8 +49,8 @@ GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
 {
     GLint elements, esize;
     GLint rowsize, padding;
-    
-    if (w < 0 || h < 0) { 
+
+    if (w < 0 || h < 0) {
 	return -1;
     }
     switch (format) {
@@ -55,9 +70,11 @@ GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
 	elements = 2;
 	break;
       case GL_RGB:
+      case GL_BGR:
 	elements = 3;
 	break;
       case GL_RGBA:
+      case GL_BGRA:
       case GL_ABGR_EXT:
 	elements = 4;
 	break;
@@ -71,7 +88,7 @@ GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
     */
     switch (type) {
       case GL_BITMAP:
-        if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
+	if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
 	   rowsize = ((w * elements)+7)/8;
 	   padding = rowsize % 4;
 	   if (padding) {
@@ -85,15 +102,36 @@ GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
       case GL_UNSIGNED_BYTE:
 	esize = 1;
 	break;
+      case GL_UNSIGNED_BYTE_3_3_2:
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+	esize = 1;
+	elements = 1;
+	break;
       case GL_SHORT:
       case GL_UNSIGNED_SHORT:
 	esize = 2;
 	break;
+      case GL_UNSIGNED_SHORT_5_6_5:
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+	esize = 2;
+	elements = 1;
+	break;
       case GL_INT:
       case GL_UNSIGNED_INT:
       case GL_FLOAT:
 	esize = 4;
 	break;
+      case GL_UNSIGNED_INT_8_8_8_8:
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+      case GL_UNSIGNED_INT_10_10_10_2:
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+	esize = 4;
+	elements = 1;
+	break;
       default:
 	return -1;
     }
@@ -151,11 +189,10 @@ GLint __glGetTexParameterfv_size(GLenum pname)
 {
     switch (pname) {
       case GL_TEXTURE_WRAP_S:
-	return 1;
       case GL_TEXTURE_WRAP_T:
+      case GL_TEXTURE_WRAP_R:
 	return 1;
       case GL_TEXTURE_MIN_FILTER:
-	return 1;
       case GL_TEXTURE_MAG_FILTER:
 	return 1;
       case GL_TEXTURE_BORDER_COLOR:
@@ -163,7 +200,12 @@ GLint __glGetTexParameterfv_size(GLenum pname)
       case GL_TEXTURE_PRIORITY:
 	return 1;
       case GL_TEXTURE_RESIDENT:
-        return 1;
+	return 1;
+      case GL_TEXTURE_MIN_LOD:
+      case GL_TEXTURE_MAX_LOD:
+      case GL_TEXTURE_BASE_LEVEL:
+      case GL_TEXTURE_MAX_LEVEL:
+	return 1;
 
       default:
 	return -1;
@@ -184,7 +226,7 @@ GLint __glGetLightfv_size(GLenum pname)
 	return 4;
       case GL_SPECULAR:
 	return 4;
-      case GL_POSITION:	    
+      case GL_POSITION:
 	return 4;
       case GL_SPOT_DIRECTION:
 	return 3;
@@ -236,7 +278,7 @@ static GLint EvalComputeK(GLenum target)
     }
     return 0;
 }
-  
+
 GLint __glGetMap_size(GLenum target, GLenum query)
 {
     GLint k, order=0, majorMinor[2];
@@ -342,7 +384,7 @@ GLint __glGetPixelMap_size(GLenum map)
 {
     GLint size;
     GLenum query;
-    
+
     switch (map) {
       case GL_PIXEL_MAP_I_TO_I:
 	query = GL_PIXEL_MAP_I_TO_I_SIZE;
@@ -454,9 +496,13 @@ GLint __glGet_size(GLenum sq)
       case GL_POINT_SIZE:
 	return 1;
       case GL_POINT_SIZE_RANGE:
+      /* case GL_SMOOTH_POINT_SIZE_RANGE: */ /* alias */
 	return 2;
       case GL_POINT_SIZE_GRANULARITY:
+      /* case GL_SMOOTH_POINT_SIZE_GRANULARITY: */ /* alias */
 	return 1;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+	return 2;
       case GL_POINT_SMOOTH:
 	return 1;
       case GL_LINE_SMOOTH:
@@ -464,9 +510,13 @@ GLint __glGet_size(GLenum sq)
       case GL_LINE_WIDTH:
 	return 1;
       case GL_LINE_WIDTH_RANGE:
+      /* case GL_SMOOTH_LINE_WIDTH_RANGE: */ /* alias */
 	return 2;
       case GL_LINE_WIDTH_GRANULARITY:
+      /* case GL_SMOOTH_LINE_WIDTH_GRANULARITY: */ /* alias */
 	return 1;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+	return 2;
       case GL_LINE_STIPPLE_PATTERN:
 	return 1;
       case GL_LINE_STIPPLE_REPEAT:
@@ -495,6 +545,8 @@ GLint __glGet_size(GLenum sq)
 	return 1;
       case GL_LIGHT_MODEL_AMBIENT:
 	return 4;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+	return 1;
       case GL_COLOR_MATERIAL:
 	return 1;
       case GL_COLOR_MATERIAL_FACE:
@@ -637,10 +689,14 @@ GLint __glGet_size(GLenum sq)
 	return 1;
       case GL_PACK_ROW_LENGTH:
 	return 1;
+      case GL_PACK_IMAGE_HEIGHT:
+	return 1;
       case GL_PACK_SKIP_ROWS:
 	return 1;
       case GL_PACK_SKIP_PIXELS:
 	return 1;
+      case GL_PACK_SKIP_IMAGES:
+	return 1;
       case GL_PACK_ALIGNMENT:
 	return 1;
       case GL_UNPACK_SWAP_BYTES:
@@ -649,10 +705,14 @@ GLint __glGet_size(GLenum sq)
 	return 1;
       case GL_UNPACK_ROW_LENGTH:
 	return 1;
+      case GL_UNPACK_IMAGE_HEIGHT:
+	return 1;
       case GL_UNPACK_SKIP_ROWS:
 	return 1;
       case GL_UNPACK_SKIP_PIXELS:
 	return 1;
+      case GL_UNPACK_SKIP_IMAGES:
+	return 1;
       case GL_UNPACK_ALIGNMENT:
 	return 1;
       case GL_MAP_COLOR:
@@ -678,11 +738,11 @@ GLint __glGet_size(GLenum sq)
       case GL_ZOOM_X:
       case GL_ZOOM_Y:
 	return 1;
-      case GL_PIXEL_MAP_I_TO_I_SIZE:      case GL_PIXEL_MAP_S_TO_S_SIZE:
-      case GL_PIXEL_MAP_I_TO_R_SIZE:      case GL_PIXEL_MAP_I_TO_G_SIZE:
-      case GL_PIXEL_MAP_I_TO_B_SIZE:      case GL_PIXEL_MAP_I_TO_A_SIZE:
-      case GL_PIXEL_MAP_R_TO_R_SIZE:      case GL_PIXEL_MAP_G_TO_G_SIZE:
-      case GL_PIXEL_MAP_B_TO_B_SIZE:      case GL_PIXEL_MAP_A_TO_A_SIZE:
+      case GL_PIXEL_MAP_I_TO_I_SIZE:	  case GL_PIXEL_MAP_S_TO_S_SIZE:
+      case GL_PIXEL_MAP_I_TO_R_SIZE:	  case GL_PIXEL_MAP_I_TO_G_SIZE:
+      case GL_PIXEL_MAP_I_TO_B_SIZE:	  case GL_PIXEL_MAP_I_TO_A_SIZE:
+      case GL_PIXEL_MAP_R_TO_R_SIZE:	  case GL_PIXEL_MAP_G_TO_G_SIZE:
+      case GL_PIXEL_MAP_B_TO_B_SIZE:	  case GL_PIXEL_MAP_A_TO_A_SIZE:
 	return 1;
       case GL_MAX_EVAL_ORDER:
 	return 1;
@@ -731,17 +791,18 @@ GLint __glGet_size(GLenum sq)
 	return 2;
       case GL_TEXTURE_1D:
       case GL_TEXTURE_2D:
+      case GL_TEXTURE_3D:
 	return 1;
       case GL_NAME_STACK_DEPTH:
 	return 1;
       case GL_MAX_VIEWPORT_DIMS:
-        return 2;
+	return 2;
       case GL_DOUBLEBUFFER:
-        return 1;
+	return 1;
       case GL_AUX_BUFFERS:
-        return 1;
+	return 1;
       case GL_STEREO:
-        return 1;
+	return 1;
       case GL_CLIP_PLANE0:	case GL_CLIP_PLANE1:
       case GL_CLIP_PLANE2:	case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:	case GL_CLIP_PLANE5:
@@ -774,14 +835,56 @@ GLint __glGet_size(GLenum sq)
 	return 1;
       case GL_TEXTURE_BINDING_1D:
       case GL_TEXTURE_BINDING_2D:
+      case GL_TEXTURE_BINDING_3D:
 	return 1;
-      case GL_BLEND_COLOR_EXT:
+      case GL_BLEND_COLOR:
 	return 4;
-      case GL_BLEND_EQUATION_EXT:
+      case GL_BLEND_EQUATION:
+	return 1;
+      case GL_COLOR_MATRIX:
+	return 16;
+      case GL_COLOR_MATRIX_STACK_DEPTH:
+	return 1;
+      case GL_COLOR_TABLE:
+      case GL_POST_CONVOLUTION_COLOR_TABLE:
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+      case GL_CONVOLUTION_1D:
+      case GL_CONVOLUTION_2D:
+      case GL_SEPARABLE_2D:
+      case GL_HISTOGRAM:
+      case GL_MINMAX:
 	return 1;
       case GL_POLYGON_OFFSET_FACTOR:
       case GL_POLYGON_OFFSET_UNITS:
 	return 1;
+      case GL_POST_CONVOLUTION_RED_SCALE:
+      case GL_POST_CONVOLUTION_GREEN_SCALE:
+      case GL_POST_CONVOLUTION_BLUE_SCALE:
+      case GL_POST_CONVOLUTION_ALPHA_SCALE:
+      case GL_POST_CONVOLUTION_RED_BIAS:
+      case GL_POST_CONVOLUTION_GREEN_BIAS:
+      case GL_POST_CONVOLUTION_BLUE_BIAS:
+      case GL_POST_CONVOLUTION_ALPHA_BIAS:
+	return 1;
+      case GL_POST_COLOR_MATRIX_RED_SCALE:
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE:
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE:
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
+      case GL_POST_COLOR_MATRIX_RED_BIAS:
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS:
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS:
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
+	return 1;
+      case GL_RESCALE_NORMAL:
+	return 1;
+      case GL_ACTIVE_TEXTURE_ARB:
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+      case GL_MAX_TEXTURE_UNITS_ARB:
+	return 1;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH:
+      case GL_MAX_CONVOLUTION_WIDTH:
+      case GL_MAX_CONVOLUTION_HEIGHT:
+	return 1;
       default:
 	return -1;
     }
@@ -812,6 +915,7 @@ GLint __glGetTexLevelParameterfv_size(GLenum pname)
     switch (pname) {
       case GL_TEXTURE_WIDTH:
       case GL_TEXTURE_HEIGHT:
+      case GL_TEXTURE_DEPTH:
       case GL_TEXTURE_COMPONENTS:
       case GL_TEXTURE_BORDER:
       case GL_TEXTURE_RED_SIZE:
@@ -832,17 +936,19 @@ GLint __glGetTexLevelParameteriv_size(GLenum pname)
 }
 
 GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
-			   GLenum type, GLint width, GLint height)
+			   GLenum type, GLint width, GLint height, GLint depth)
 {
     GLint elements, esize;
     GLint padding, rowsize;
 
     switch (format) {
       case GL_RGBA:
+      case GL_BGRA:
       case GL_ABGR_EXT:
 	elements = 4;
 	break;
       case GL_RGB:
+      case GL_BGR:
 	elements = 3;
 	break;
       case GL_RED:
@@ -863,15 +969,36 @@ GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
       case GL_UNSIGNED_BYTE:
 	esize = 1;
 	break;
+      case GL_UNSIGNED_BYTE_3_3_2:
+      case GL_UNSIGNED_BYTE_2_3_3_REV:
+	esize = 1;
+	elements = 1;
+	break;
       case GL_SHORT:
       case GL_UNSIGNED_SHORT:
 	esize = 2;
 	break;
+      case GL_UNSIGNED_SHORT_5_6_5:
+      case GL_UNSIGNED_SHORT_5_6_5_REV:
+      case GL_UNSIGNED_SHORT_4_4_4_4:
+      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
+      case GL_UNSIGNED_SHORT_5_5_5_1:
+      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
+	esize = 2;
+	elements = 1;
+	break;
       case GL_INT:
       case GL_UNSIGNED_INT:
       case GL_FLOAT:
 	esize = 4;
 	break;
+      case GL_UNSIGNED_INT_8_8_8_8:
+      case GL_UNSIGNED_INT_8_8_8_8_REV:
+      case GL_UNSIGNED_INT_10_10_10_2:
+      case GL_UNSIGNED_INT_2_10_10_10_REV:
+	esize = 4;
+	elements = 1;
+	break;
       default:
 	return -1;
     }
@@ -885,5 +1012,95 @@ GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
     if (padding) {
 	rowsize += 4 - padding;
     }
-    return (rowsize * height);
+    return (rowsize * height * depth);
 }
+
+GLint __glGetConvolutionParameteriv_size(GLenum pname)
+{
+    switch (pname) {
+      case GL_CONVOLUTION_BORDER_COLOR:
+      case GL_CONVOLUTION_FILTER_SCALE:
+      case GL_CONVOLUTION_FILTER_BIAS:
+	return 4;
+      case GL_CONVOLUTION_BORDER_MODE:
+      case GL_CONVOLUTION_FORMAT:
+      case GL_CONVOLUTION_WIDTH:
+      case GL_CONVOLUTION_HEIGHT:
+      case GL_MAX_CONVOLUTION_WIDTH:
+      case GL_MAX_CONVOLUTION_HEIGHT:
+	return 1;
+      default:
+	return -1;
+    }
+}
+
+GLint __glGetConvolutionParameterfv_size(GLenum pname)
+{
+    return __glGetConvolutionParameteriv_size(pname);
+}
+
+
+GLint __glGetHistogramParameterfv_size(GLenum pname)
+{
+    switch (pname) {
+      case GL_HISTOGRAM_WIDTH:
+      case GL_HISTOGRAM_FORMAT:
+      case GL_HISTOGRAM_RED_SIZE:
+      case GL_HISTOGRAM_GREEN_SIZE:
+      case GL_HISTOGRAM_BLUE_SIZE:
+      case GL_HISTOGRAM_ALPHA_SIZE:
+      case GL_HISTOGRAM_LUMINANCE_SIZE:
+      case GL_HISTOGRAM_SINK:
+	return 1;
+      default:
+	return -1;
+    }
+}
+
+GLint __glGetHistogramParameteriv_size(GLenum pname)
+{
+    return __glGetHistogramParameterfv_size(pname);
+}
+
+GLint __glGetMinmaxParameterfv_size(GLenum pname)
+{
+    switch (pname) {
+      case GL_MINMAX_FORMAT:
+      case GL_MINMAX_SINK:
+	return 1;
+      default:
+	return -1;
+    }
+}
+
+GLint __glGetMinmaxParameteriv_size(GLenum pname)
+{
+    return __glGetMinmaxParameterfv_size(pname);
+}
+
+GLint __glGetColorTableParameterfv_size(GLenum pname)
+{
+    switch(pname) {
+
+    case GL_COLOR_TABLE_SCALE: /* return RGBA */
+    case GL_COLOR_TABLE_BIAS:
+	return 4;
+    case GL_COLOR_TABLE_FORMAT:
+    case GL_COLOR_TABLE_WIDTH:
+    case GL_COLOR_TABLE_RED_SIZE:
+    case GL_COLOR_TABLE_GREEN_SIZE:
+    case GL_COLOR_TABLE_BLUE_SIZE:
+    case GL_COLOR_TABLE_ALPHA_SIZE:
+    case GL_COLOR_TABLE_LUMINANCE_SIZE:
+    case GL_COLOR_TABLE_INTENSITY_SIZE:
+	return 1;
+    default:
+	return 0;
+    }
+}
+
+GLint __glGetColorTableParameteriv_size(GLenum pname)
+{
+    return __glGetColorTableParameterfv_size(pname);
+}
+
diff --git a/xc/programs/Xserver/GL/glx/singlesize.h b/xc/programs/Xserver/GL/glx/singlesize.h
index 97381639a..4693e5962 100644
--- a/xc/programs/Xserver/GL/glx/singlesize.h
+++ b/xc/programs/Xserver/GL/glx/singlesize.h
@@ -1,26 +1,41 @@
 #ifndef _singlesize_h_
 #define _singlesize_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.2 1999/06/14 07:31:36 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlesize.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 extern GLint __glReadPixels_size(GLenum format, GLenum type,
@@ -52,7 +67,16 @@ extern GLint __glGetBooleanv_size(GLenum sq);
 extern GLint __glGetTexLevelParameterfv_size(GLenum pname);
 extern GLint __glGetTexLevelParameteriv_size(GLenum pname);
 extern GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
-				  GLenum type, GLint width, GLint height);
+				  GLenum type, GLint width, GLint height,
+				  GLint depth);
+extern GLint __glGetColorTableParameterfv_size(GLenum pname);
+extern GLint __glGetColorTableParameteriv_size(GLenum pname);
+extern GLint __glGetConvolutionParameterfv_size(GLenum pname);
+extern GLint __glGetConvolutionParameteriv_size(GLenum pname);
+extern GLint __glGetHistogramParameterfv_size(GLenum pname);
+extern GLint __glGetHistogramParameteriv_size(GLenum pname);
+extern GLint __glGetMinmaxParameterfv_size(GLenum pname);
+extern GLint __glGetMinmaxParameteriv_size(GLenum pname);
 
 #endif /* _singlesize_h_ */
 
diff --git a/xc/programs/Xserver/GL/glx/unpack.h b/xc/programs/Xserver/GL/glx/unpack.h
index 80a805aab..971e4b047 100644
--- a/xc/programs/Xserver/GL/glx/unpack.h
+++ b/xc/programs/Xserver/GL/glx/unpack.h
@@ -1,26 +1,41 @@
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__
 
-/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.2 1999/06/14 07:31:36 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/unpack.h,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define __GLX_PAD(s) (((s)+3) & (GLuint)~3)
@@ -41,7 +56,7 @@
 #define __GLX_GET_DOUBLE(dst,src)	(dst) = *((GLdouble*)(src))
 #endif
 
-extern void __glXMemInit();
+extern void __glXMemInit(void);
 
 extern xGLXSingleReply __glXReply;
 
@@ -134,6 +149,7 @@ extern xGLXSingleReply __glXReply;
   	GLbyte *swapPC;		\
   	GLbyte *swapEnd
 
+
 #define __GLX_SWAP_INT(pc) 			\
   	sw = ((GLbyte *)(pc))[0]; 		\
   	((GLbyte *)(pc))[0] = ((GLbyte *)(pc))[3]; 	\
diff --git a/xc/programs/Xserver/GL/glx/xfont.c b/xc/programs/Xserver/GL/glx/xfont.c
index 8bf6e8116..e12ae4be1 100644
--- a/xc/programs/Xserver/GL/glx/xfont.c
+++ b/xc/programs/Xserver/GL/glx/xfont.c
@@ -1,23 +1,38 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.2 1999/06/14 07:31:36 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:24 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/xfont.c,v 1.1.1.3.18.1 2001/02/15 04:14:24 gareth Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/include/GL/glx_ansic.h b/xc/programs/Xserver/GL/include/GL/glx_ansic.h
index e6ccd3a2f..8744547ce 100644
--- a/xc/programs/Xserver/GL/include/GL/glx_ansic.h
+++ b/xc/programs/Xserver/GL/include/GL/glx_ansic.h
@@ -1,26 +1,41 @@
 #ifndef _glx_ansic_h_
 #define _glx_ansic_h_
 
-/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.3 1999/07/11 08:49:18 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: The application programming interfaces
+** established by SGI in conjunction with the Original Code are The
+** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
+** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
+** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
+** Window System(R) (Version 1.3), released October 19, 1998. This software
+** was created using the OpenGL(R) version 1.2.1 Sample Implementation
+** published by SGI, but has not been independently verified as being
+** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-** $SGI$
+** $Date: 2001/02/15 04:14:25 $ $Revision: 1.1.1.3.18.1 $
+** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.1.1.3.18.1 2001/02/15 04:14:25 gareth Exp $
 */
 
 /*
@@ -37,18 +52,13 @@
 ** tree and all should be taken care of.
 */
 
-#ifdef XFree86Server
+#ifdef XF86
 #include <xf86Version.h>
 #define XF_Minimum_Version ( (3 * 10) + (9) )
 #define XF_Version ( (XF86_VERSION_MAJOR * 10) + (XF86_VERSION_MINOR) )
 #endif
 
-#if defined(XFree86LOADER) && defined(XFree86Server) && ( XF_Version >= XF_Minimum_Version)
-#include "xf86_ansic.h"
-#else
-#endif
-
-#if 0 && defined(XFree86LOADER) && defined(XFree86Server) && ( XF_Version >= XF_Minimum_Version)
+#if XF86 && ( XF_Version >= XF_Minimum_Version)
 
 #include "xf86Module.h"
 
@@ -99,6 +109,8 @@
 #define __glXStrtok(s, delim)		xf86strtok(s, delim)
 #define __glXStrcspn(s, reject)		xf86strcspn(s, reject)
 #define __glXGetenv(a)			xf86getenv(a)
+#define __glXAtoi(a)			xf86atoi(a)
+
 
 #ifndef assert
 #define assert(a)
@@ -110,19 +122,6 @@
 ** Either not a loadable module, or pre X3.9
 */
 
-/* assert() is named __assert() in the LynxOS libc. We might get
- * unresolved externals if we #undef assert and include assert.h
- * if assert.h was already included on our way here....
- */
-#if defined(Lynx) && defined(__assert_h)
-#undef __assert_h
-#endif
-
-#ifdef assert
-#undef assert
-#endif
-
-#include <assert.h>
 
 #define GLX_STDOUT			stdout
 #define GLX_STDERR			stderr
@@ -157,6 +156,7 @@
 #define __glXStrtok(s, delim)		strtok(s, delim)
 #define __glXStrcspn(s, reject)		strcspn(s, reject)
 #define __glXGetenv(a)			getenv(a)
+#define __glXAtoi(a)			atoi(a)
 
 #endif
 
diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile
index b818c9b65..ecf3dbdb1 100644
--- a/xc/programs/Xserver/Imakefile
+++ b/xc/programs/Xserver/Imakefile
@@ -662,7 +662,8 @@ XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX)
 #endif
 XF86SERVEROBJS = $(XF86DRVOBJS) $(XF86IDRVOBJS)
 XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB)
+		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \
+		 $(XF86DDCLIB)
 #if HasParallelMake
 MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
 #endif
diff --git a/xc/programs/Xserver/hw/kdrive/trident/trident.c b/xc/programs/Xserver/hw/kdrive/trident/trident.c
index 6f7e8ae7d..88f797b7f 100644
--- a/xc/programs/Xserver/hw/kdrive/trident/trident.c
+++ b/xc/programs/Xserver/hw/kdrive/trident/trident.c
@@ -1,6 +1,4 @@
 /*
- * $Id: trident.c,v 1.1.1.8 2000/11/30 23:14:52 dawes Exp $
- *
  * Copyright © 1999 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
index 8a67ad8e1..170ba136d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml
@@ -3,16 +3,16 @@
 ]>
 
 <!-- Created: Mon Feb 28 13:00:00 2000 by brianp@valinux.com -->
-<!-- Revised: Fri May 19 09:41:48 2000 by martin@valinux.com -->
-<!-- Revised: Tue Aug 22 14:00:00 2000 by brianp@valinux.com -->
+<!-- Revised: Sat Jan  6 09:44:18 2001 by martin@valinux.com -->
 
   <article>
     <title>DRI User Guide
     <author>
         <htmlurl url="http://www.valinux.com/"
           name="VA Linux Systems, Inc."> Professional Services - Graphics.
-    <date>15 December 2000
+    <date>9 February 2001
 
+<p>
     <ident>
     $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.15 2000/12/12 18:54:29 dawes Exp $
     </ident>
@@ -23,7 +23,7 @@
 <p>
       <sect1>Copyright
 <p>
-          <bf>Copyright &copy; 2000 by VA Linux Systems, Inc.
+          <bf>Copyright &copy; 2000-2001 by VA Linux Systems, Inc.
           All Rights Reserved.</bf>
 <p>
           <bf>Permission is granted to make and distribute verbatim copies 
@@ -44,7 +44,8 @@
           3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of
           3dfx Interactive, Incorporated.
 	  Matrox is a registered trademark of Matrox Electronic Systems Ltd.
-	  ATI Rage is a registered trademark of ATI Technologies, Inc.
+	  ATI Rage and Radeon are registered trademarks of ATI Technologies,
+	  Inc.
           All other trademarks mentioned are the property of their
           respective owners.
 
@@ -94,35 +95,9 @@
           Like the SSE optimizations, a runtime check is made to determine
           if the CPU can execute 3DNow! instructions.
 
-          The build environment for both of these new architectures 
-          have a pre-build environment that will correctly build the 
-          DRI drivers and Mesa meaning no extra configuration is necessary
-          to build the DRI for these architectures.
-
-        <sect2>Alpha Features
-	<p>
-            On newer Alpha processors, it should be noted that a
-            significant performance increase can be seen with the 
-            addition of the -mcpu= command that should be passed to
-            GCC upon compilation. Dependent of the architecture of the 
-            processor, for example -mcpu=ev6 will build specifically
-            for the EV6 based AXP's, giving both byte and word alignment 
-            access to the DRI/Mesa drivers.
-
-            Use this as an example of compiling with this extra speed.
-            In your host.def file that should reside in the xc/config 
-            directory, add the line.
-
-            #define DefaultGcc2AxpOpt -O2 -mcpu=ev6
-
-            Additional speed improvements to 3D rendering can be achieved
-            by installing Compaq's Math Libraries (CPML) which can be 
-            obtained from the following URL.
-
-            http://www.support.compaq.com/alpha-tools/software/index.html
-
-          Alpha systems can benefit from several compile-time optimizations
-          which are described in the DRI Compile Guide.
+          Alpha-based systems can use Compaq's optimized math library for
+          improved 3D performance.  See the DRI Compilation Guide for
+          details.
 
       <sect1> Graphics Hardware
 	<p>
@@ -167,6 +142,11 @@
 	    The PCI versions of these cards also have minimal support.
 	    Note that there are Rage 128 Pro boards on the market but they're
             not yet supported.
+	  <item>ATI Radeon, supported on Intel x86 and AMD:
+            <itemize>
+              <item>Radeon SDR AGP
+              <item>Radeon DDR AGP
+            </itemize>
           <item>3Dlabs, supported on Intel x86 and AMD:
             <itemize>
               <item>Oxygen GMX 2000 (MX/Gamma based).
@@ -246,9 +226,13 @@
 
         Next, the DRI section can be used to restrict access to direct
         rendering.
+        A client can only use direct rendering if it has permission to
+        open the <tt>/dev/dri/card?</tt> file(s).
+        The permissions on these DRI device files is controlled by the "DRI"
+        section in the XF86Config file.
         <p>
         If you want all of the users on your system to be able to use
-        direct-rendering, then use a simple DRI section:
+        direct-rendering, then use a simple DRI section like this:
         <verb>
 	Section "DRI"
 	     Mode 0666
@@ -471,8 +455,70 @@
     <sect>General Trouble Shooting
 <p>
         This section contains information to help you diagnose general
-         problems.
-         See below for additional information for specific hardware.
+        problems.
+        See below for additional information for specific hardware.
+
+      <sect1>Bus Mastering
+<p>
+        DMA-based DRI drivers (that's most DRI drivers) cannot function
+        unless bus mastering is enabled for your graphics card.
+        By default, some systems don't having bus mastering on.
+        You should enable it in your BIOS.
+        <p>
+        Alternately, you can check the status of bus mastering and change
+        the setting from within Linux.  There may be similar procedures for
+        other operating systems.
+        <p>
+        Run <tt>lspci</tt> (as root) and find the information
+        describing your graphics adapter.  For example:
+        <P>
+
+        <verb>
+    00:00.0 Host bridge: Intel Corporation 440BX/ZX - 82443BX/ZX Host bridge (rev 03)
+    00:01.0 PCI bridge: Intel Corporation 440BX/ZX - 82443BX/ZX AGP bridge (rev 03)
+    00:07.0 ISA bridge: Intel Corporation 82371AB PIIX4 ISA (rev 02)
+    00:07.1 IDE interface: Intel Corporation 82371AB PIIX4 IDE (rev 01)
+    00:07.2 USB Controller: Intel Corporation 82371AB PIIX4 USB (rev 01)
+    00:07.3 Bridge: Intel Corporation 82371AB PIIX4 ACPI (rev 02)
+    00:11.0 Ethernet controller: Intel Corporation 82557 [Ethernet Pro 100] (rev 08)
+    00:12.0 SCSI storage controller: Symbios Logic Inc. (formerly NCR) 53c895 (rev 02)
+    00:14.0 Multimedia audio controller: Ensoniq ES1371 [AudioPCI-97] (rev 08)
+    01:00.0 VGA compatible controller: 3Dfx Interactive, Inc.: Unknown device 0009 (rev 01)
+        </verb>
+        <p>
+	The bus, device, and function number comprise the device id,
+	which is conventionally written in the form bus:dev.func, or 
+	in this case 01:00.0.
+        <p>
+        Use the <tt>setpci</tt> command to examine bit two of register 4 for
+        your graphics card.  This will indicate whether or not bus mastering
+        is enabled.
+        <p>
+        <verb>
+        setpci -s 01:00.0 4.w
+        </verb>
+        <p>
+        A hexidecimal value will be printed.  Convert the least significant
+        digit to binary.  For example, if you see 3, that's 0011 in binary
+        (bit two is 0).  If you see 7, that's 0111 in binary (bit two is 1).
+        In the first example, bus mastering is disabled.  It's enabled in
+        the second example.
+        <p>
+        The following shell script will enabled bus mastering for your
+        graphics card and host bridge.  Run it as root.
+        <verb>
+    #!/bin/bash
+    dev=01:00.0   # change as appropriate
+    echo Enabling bus mastering on device $dev
+    setpci -s $dev 4.w=$(printf %x $((0x$(setpci -s $dev 4.w)|4)))
+    dev=00:00.0
+    echo Enabling bus mastering on host bridge $dev
+    setpci -s $dev 4.w=$(printf %x $((0x$(setpci -s $dev 4.w)|4)))
+        </verb>
+        <p>
+        You can check if this worked by running the first setpci command again.
+        <p>
+
 
       <sect1>The X Server
 <p>
@@ -701,14 +747,22 @@
             </verb>
 
           <p>
-            The kernel module for the Voodoo3 is named <tt>tdfx.o</tt> and
+            The kernel module for 3dfx hardware is named <tt>tdfx.o</tt> and
 	    should be installed in /lib/modules/2.4.x/kernel/driver/char/drm/.
             It will be automatically loaded by the Xserver if needed.
           <p>
-	    The DRI 3D driver for the Voodoo3 should be in
+	    The DRI 3D driver for 3dfx hardware should be in
 	    <tt>/usr/X11R6/lib/modules/dri/tdfx_dri.so</tt>.
             This will be automatically loaded by libGL.so.
           <p>
+            The Voodoo5 supports 3D rendering in 16 and 32 bpp modes.
+            When running in 32bpp mode an 8-bit stencil buffer and 24-bit
+            Z (depth) buffer are offered.
+            When running in 16bpp mode only a 16-bit Z (depth) buffer is
+            offered and stencil is implemented in software.
+          <p>
+            A software-based accumulation buffer is available in both
+            16 and 32bpp modes.
 
         <sect2>Troubleshooting
 <p>
@@ -726,9 +780,17 @@
               the 16 bit/pixel screen mode.
               Use <tt/xdpyinfo/ to verify that all your visuals are depth 16.
               Edit your XF86Config file if needed.
-           <item>
+            <item>
               The <tt>/dev/3dfx</tt> device is not used for DRI; it's only for
               Glide on older 3dfx hardware.
+            <item>
+              Different versions of Glide are needed for Voodoo3 and Voodoo5.
+              See the DRI website's resources page to download the right
+              version of Glide.
+            <item>
+              Voodoo4/5 may be run at 24bpp (instead of 32bpp, the default)
+              but 3D acceleration is not supported in that mode.
+              32bpp mode is fully 3D accelerated.
           </itemize>
 
         <sect2>Performance
@@ -737,7 +799,7 @@
             <item>
               Normally, buffer swapping in double-buffered applications is
               synchronized to your monitor's refresh rate.
-              This may be overridden by setting the <tt/FX_GLIDE_SWAPINTERNVAL/
+              This may be overridden by setting the <tt/FX_GLIDE_SWAPINTERVAL/
               environment variable.
               The value of this variable indicates the maximum number of
               swap buffer commands can be buffered.
@@ -793,97 +855,6 @@
                   Using <tt/glColorMask(r, g, b, a)/ when r!=g or g!=b.
               </itemize>
             <item>
-              The lowest mipmap level is sometimes miscolored in trilinear-
-              sampled polygons.
-          </itemize>
-
-
-      <sect1>3dfx Voodoo5 Series
-<p>
-        <sect2>Dependencies
-<p>
-          The Voodoo5 DRI driver requires a special versions of
-          the 3dfx Glide library, different than that used for Voodoo3
-          hardware.
-          It can be downloaded from the DRI website.
-<p>
-        <sect2>Configuration
-<p>
-            Your XF86Config file's device section must specify the
-            <tt>tdfx</tt> device:
-            <verb>
-        Section "Device"
-            Identifier  "Voodoo5"
-            VendorName  "3dfx"
-            Driver      "tdfx"
-        EndSection
-            </verb>
-            The Screen section should then reference the Voodoo3 device:
-            <verb>
-	Section "Screen"
-	    Identifier  "Screen 1"
-	    Device      "Voodoo5"
-	    Monitor     "High Res Monitor"
-	    DefaultDepth 24
-	    Subsection "Display"
-		Depth       16
-		Modes       "1280x1024" "1024x768" "800x600" "640x480"
-		ViewPort    0 0
-	    EndSubsection
-	    Subsection "Display"
-		Depth       24
-		Modes       "1280x1024" "1024x768" "800x600" "640x480"
-		ViewPort    0 0
-	    EndSubsection
-        EndSection
-            </verb>
-          <p>
-            The kernel module for the Voodoo5 is named <tt>tdfx.o</tt> and
-	    should be installed in /lib/modules/2.4.x/kernel/driver/char/drm/.
-            It will be automatically loaded by the Xserver if needed.
-          <p>
-	    The DRI 3D driver for the Voodoo5 should be in
-	    <tt>/usr/X11R6/lib/modules/dri/tdfx_dri.so</tt>.
-            This will be automatically loaded by libGL.so.
-          <p>
-            The Voodoo5 supports 3D rendering in 16 and 32 bpp modes.
-            When running in 32bpp mode an 8-bit stencil buffer and 24-bit
-            Z (depth) buffer are offered.
-            When running in 16bpp mode only a 16-bit Z (depth) buffer is
-            offered and stencil is implemented in software.
-          <p>
-            A software-based accumulation buffer is available in both
-            16 and 32bpp modes.
-          <p>
-
-        <sect2>Troubleshooting
-<p>
-          <itemize>
-           <item>
-              The <tt>/dev/3dfx</tt> device is not used for DRI; it's only for
-              Glide on older 3dfx hardware.
-           <item>
-              Different versions of Glide are needed for Voodoo3 and Voodoo5.
-              See the DRI website's resources page to download the right
-              version of Glide.
-          </itemize>
-
-        <sect2>Performance
-<p>
-          <itemize>
-            <item>
-              Normally, buffer swapping in double-buffered applications is
-              synchronized to your monitor's refresh rate.
-              This may be overridden by setting the <tt/FX_GLIDE_SWAPINTERNVAL/
-              environment variable.
-              The value of this variable indicates the maximum number of
-              swap buffer commands can be buffered.
-              Zero allows maximum frame rate.
-            <item>
-              Rendering with 16-bit per texel textures is faster than using
-              32-bit per texel textures.  The <tt/internalFormat/ parameter
-              to <tt/glTexImage2D/ can be used to control texel size.
-            <item>
               The Voodoo5 driver reverts to software rendering under the
               same conditions Voodoo3 with three exceptions.
               First, stencil operations are implemented in hardware when the
@@ -892,6 +863,18 @@
               hardware.
               Third, <tt/glColorMask/ is fully supported in hardware when
               the screen is configured for 32 bits/pixel.
+            <item>
+              As of January, 2001 the second VSA-100 chip on the Voodoo5 is
+              not yet operational.
+              Therefore, the board isn't being used to its full capacity.
+              The second VSA-100 chip will allow Scan-Line Interleave (SLI)
+              mode for full-screen applications and games, potentially doubling
+              the system's fill rate.
+              When the second VSA-100 chip is activated
+              glGetString(GL_RENDERER) will report Voodoo5 instead of Voodoo4.
+            <item>
+              The lowest mipmap level is sometimes miscolored in trilinear-
+              sampled polygons.
           </itemize>
 
         <sect2>Known Problems
@@ -901,25 +884,12 @@
               The lowest mipmap level is sometimes miscolored in trilinear-
               sampled polygons (Voodoo3/Banshee).
             <item>
-              Voodoo4/5 may be run at 24bpp (instead of 32bpp, the default)
-              but 3D acceleration is not supported in that mode.
-              32bpp mode is fully 3D accelerated.
-            <item>
               Fog doesn't work with orthographic projections.
             <item>
               The accuracy of blending operations on Voodoo4/5 isn't always
               very good.
               If you run Glean, you'll find some test failures.
             <item>
-              As of October, 2000 the second VSA-100 chip on the Voodoo5 is
-              not yet operational.
-              Therefore, the board isn't being used to its full capacity.
-              The second VSA-100 chip will allow Scan-Line Interleave (SLI)
-              mode for full-screen applications and games, potentially doubling
-              the system's fill rate.
-              When the second VSA-100 chip is activated
-              glGetString(GL_RENDERER) will report Voodoo5 instead of Voodoo4.
-            <item>
               The Glide library cannot be used directly; it's only meant to
               be used via the tdfx DRI driver.
             <item>
@@ -1133,12 +1103,12 @@
         <sect2>Configuration
         <p>
           Your XF86Config file's device section must specify the
-          <tt>r128</tt> device:
+          <tt>ati</tt> device:
           <verb>
         Section "Device"
             Identifier  "Rage128"
             VendorName  "ATI"
-            Driver      "r128"
+            Driver      "ati"
         EndSection
             </verb>
             The Screen section should then reference the Rage 128 device:
@@ -1180,8 +1150,67 @@
 
         <sect2>Known Problems
 <p>
-          DGA is not yet supported in the ATI Rage 128 X server.  This
-          feature will be added in a future release.
+          None.
+
+
+      <sect1>ATI Radeon
+      <p>
+        <sect2>Dependencies
+        <p>
+          A Linux kernel with AGP GART support (such as the 2.4.x test
+          kernels) is needed.
+          <p>
+        <sect2>Configuration
+        <p>
+          Your XF86Config file's device section must specify the
+          <tt>ati</tt> device:
+          <verb>
+        Section "Device"
+            Identifier  "Radeon"
+            VendorName  "ATI"
+            Driver      "ati"
+        EndSection
+            </verb>
+            The Screen section should then reference the Radeon device:
+            <verb>
+	Section "Screen"
+	    Identifier  "Screen 1"
+	    Device      "Radeon"
+	    Monitor     "High Res Monitor"
+	    DefaultDepth 16
+	    Subsection "Display"
+		Depth       16
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+	    Subsection "Display"
+		Depth       32
+		Modes       "1280x1024" "1024x768" "800x600" "640x480"
+		ViewPort    0 0
+	    EndSubsection
+        EndSection
+            </verb>
+          <p>
+            The kernel module for the Radeon is named <tt>radeon.o</tt> and
+	    should be installed in /lib/modules/2.4.x/kernel/driver/char/drm/.
+            It will be automatically loaded by the Xserver if needed.
+          <p>
+	    The DRI 3D driver for the Radeon should be in
+	    <tt>/usr/X11R6/lib/modules/dri/radeon_dri.so</tt>.
+            This will be automatically loaded by libGL.so.
+          <p>
+            You may also set your screen depth to 32 for 32bpp mode.
+          <p>
+
+        <sect2>Performance
+<p>
+          While this driver supports many of the features of ATI Radeon
+          cards, we do not <em/yet/ fully support the card's TCL
+          features.  This work is progressing, but is not yet ready.
+
+        <sect2>Known Problems
+<p>
+          None.
 
 
       <sect1>3DLabs Oxygen GMX 2000
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
index b61ba636e..830e91736 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
@@ -3,15 +3,16 @@
 ]>
 
 <!-- Created: Sun Mar 12 13:00:00 2000 by brianp@valinux.com -->
-<!-- Revised: Fri May 19 09:36:02 2000 by martin@valinux.com -->
-<!-- Revised: Sat Aug 19 14:00:00 2000 by brianp@valinux.com -->
+<!-- Revised: Sat Jan  6 10:15:22 2001 by martin@valinux.com -->
 
   <article>
     <title>DRI Compilation Guide
     <author>
         <htmlurl url="http://www.valinux.com/"
           name="VA Linux Systems, Inc."> Professional Services - Graphics.
-    <date>15 December 2000
+    <date>11 January 2001
+
+<p>
 
     <ident>
     $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.9 2000/12/12 17:48:10 alanh Exp $
@@ -23,7 +24,7 @@
 
       <sect1>Copyright <p>
 
-          <bf>Copyright &copy; 2000 by VA Linux Systems, Inc.
+          <bf>Copyright &copy; 2000-2001 by VA Linux Systems, Inc.
           All Rights Reserved.</bf>
         <p>
           <bf>Permission is granted to make and distribute verbatim copies 
@@ -44,7 +45,8 @@
           3dfx, Voodoo3, Voodoo4, and Voodoo5 are registered trademarks of
           3dfx Interactive, Incorporated.
 	  Matrox is a registered trademark of Matrox Electronic Systems Ltd.
-	  ATI Rage is a registered trademark of ATI Technologies, Inc.
+	  ATI Rage and Radeon is a registered trademark of ATI Technologies,
+	  Inc.
           All other trademarks mentioned are the property of their
           respective owners.
 
@@ -79,7 +81,8 @@
 
       <p>
         The DRI 3D drivers generally work on systems with Intel or AMD CPUs.
-        However, there is limited support for Alpha and Sparc.
+        However, there is limited support for Alpha and PowerPC support is
+        underway.
 
       <p>
         For 3dfx Voodoo3 hardware, you'll also need:
@@ -105,7 +108,7 @@
         </itemize>
 
       <p>
-        For ATI Rage 128 hardware, you'll also need:
+        For ATI Rage 128 and Radeon hardware, you'll also need:
         <itemize>
           <item>A recent Linux 2.4.x kernel with AGP support.
         </itemize>
@@ -113,12 +116,11 @@
 
     <sect>Linux Kernel Preparation <p>
 
-        The DRI project closely tracks Linux kernel development.
-        Since the internal Linux data structures change frequently in
-        the 2.4 development branch it's important to have use the most
-        recent Linux kernel.
-        As of this writing (Nov 2000), 2.4.0-test11-pre5 is the most
-        recent version of Linux which the DRI is synchronized to.
+        The DRI project closely tracks Linux kernel development.  Since
+        the internal Linux data structures might change in the 2.4 Linux
+        kernel, it's important to have use the most recent Linux kernel.
+        As of this writing (Jan 2001), 2.4.0 is the most recent version
+        of Linux which the DRI is synchronized to.
       <p>
         Most of the DRI drivers require AGP support and using Intel
         Pentium III SSE optimizations also requires an up-to-date Linux
@@ -244,7 +246,7 @@
             To enable this optimization edit your xc/config/host.def file
             and add the line:
 
-            #define DefaultCCOptions -ansi GccWarningOptions -pipe -mcpu=ev6
+            #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 
 
             Additional speed improvements to 3D rendering can be achieved
             by installing Compaq's Math Libraries (CPML) which can be 
@@ -407,6 +409,7 @@
             /* #define GlxBuiltInTdfx YES */
             /* #define GlxBuiltInMga YES */
             /* #define GlxBuiltInR128 YES */
+            /* #define GlxBuiltInRadeon YES */
             /* #define DoLoadableServer NO */
             #define SharedLibFont NO
           </verb>
@@ -486,6 +489,7 @@
           For the 3dfx Voodoo, you should see <em>tdfx.o</em>.
           For the Matrox G200/G400, you should see <em>mga.o</em>.
           For the ATI Rage 128, you should see <em>r128.o</em>.
+          For the ATI Radeon, you should see <em>radeon.o</em>.
           For the Intel i810, you should see <em>i810.o</em>.
         <p>
           If the DRI kernel module(s) failed to build you should verify
@@ -515,7 +519,7 @@
         <p>
         To load the appropriate DRI module in your running kernel you can
         either use ismod and restart your X server or copy the kernel module
-        to <tt>/lib/modules/2.4.x/kernel/driver/char/drm/</tt> then run
+        to <tt>/lib/modules/2.4.x/kernel/drivers/char/drm/</tt> then run
         depmod and restart your X server.
         <p>
         Make sure you first unload any older DRI kernel modules that might
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
index babeeeb5c..57eb82299 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
@@ -585,6 +585,8 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] %d DMA buffers mapped\n",
 	       pGlint->drmBufs->count);
 
+    xf86EnableBusMaster(pGlint->PciTag);
+
     /* tell the generic kernel driver how to handle Gamma DMA */
     if (pGlint->irq <= 0) {
 	pGlint->irq = drmGetInterruptFromBusID(pGlint->drmSubFD,
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
index 89e21850d..92fbdc925 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
@@ -683,6 +683,7 @@ Bool I810DRIScreenInit(ScreenPtr pScreen)
    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] added %d %d byte DMA buffers\n",
 	      bufs, I810_DMA_BUF_SZ);
 
+   xf86EnableBusMaster(pI810->PciTag);
 
    I810InitDma(pScrn);
    
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
index fdb5c0bb4..d9c83d9ba 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
@@ -802,7 +802,6 @@ MGANAME(AccelInit)(ScreenPtr pScreen)
     maxlines = (min(pMga->FbUsableSize, 16*1024*1024)) /
 	               (pScrn->displayWidth * PSZ / 8);
 
-
 #ifdef XF86DRI
     if ( pMga->directRenderingEnabled ) {
        MGADRIServerPrivatePtr pMGADRIServer = pMga->DRIServerInfo;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
index 62ee2add7..beee925a7 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
@@ -12,6 +12,7 @@
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
+#include "xf86xv.h"
 #include "tdfxdefs.h"
 
 #ifdef XF86DRI
@@ -35,16 +36,11 @@
 struct _TDFXRec;
 typedef struct _TDFXRec *TDFXPtr;
 
-#ifdef XF86DRI
-#define PIXMAP_CACHE_LINES 750
-#else
-#define PIXMAP_CACHE_LINES 2048
-#endif
-
-
 #include "tdfx_priv.h"
 extern void TDFXSwapContextFifo(ScreenPtr pScreen);
 extern void TDFXLostContext(ScreenPtr pScreen);
+extern Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples);
+extern Bool TDFXDisableSLI(TDFXPtr pTDFX);
 
 #ifdef XF86DRI
 extern void FillPrivateDRI(TDFXPtr pTDFX, TDFXDRIPtr pTDFXDRI);
@@ -205,7 +201,19 @@ typedef struct _TDFXRec {
    * shadow everything and make it happen automatically for every write. */
   INT32 sst2DSrcFmtShadow;
   INT32 sst2DDstFmtShadow;
-  int pixmapCacheLines;
+  int pixmapCacheLinesMin;
+  int pixmapCacheLinesMax;
+  FBAreaPtr reservedArea;
+  Bool ShowCache;
+  Bool OverlayXvideo;
+  Bool TextureXvideo;
+  int videoKey;
+  void (*VideoTimerCallback)(ScrnInfoPtr, Time);
+  FBLinearPtr overlayBuffer;
+  FBAreaPtr textureBuffer;
+  XF86VideoAdaptorPtr overlayAdaptor;
+  XF86VideoAdaptorPtr textureAdaptor;
+  ScreenBlockHandlerProcPtr BlockHandler;
 } TDFXRec;
 
 typedef struct {
@@ -215,6 +223,15 @@ typedef struct {
   int TexOwner;
 } TDFXSAREAPriv;
 
+typedef struct {
+   RegionRec     clip;
+   CARD32        colorKey;
+   int           filterQuality;
+   CARD32        videoStatus;
+   Time          offTime;
+   Time          freeTime;
+} TDFXPortPrivRec, *TDFXPortPrivPtr;
+
 #define TDFXPTR(p) ((TDFXPtr)((p)->driverPrivate))
 
 #define DRAW_STATE_CLIPPING 0x1
@@ -269,5 +286,3 @@ extern void TDFXSelectBuffer(TDFXPtr pTDFX, int which);
 
 
 #endif
-
-
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c
index 896add046..d97363b57 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c
@@ -6,6 +6,7 @@
 #include "dgaproc.h"
 
 #include "tdfx.h"
+#include "vgaHW.h"
 
 static Bool TDFX_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
 				 int *, int *, int *);
@@ -93,24 +94,20 @@ SECOND_PASS:
       currentMode->imageHeight =  pScrn->virtualY;
       currentMode->pixmapWidth = currentMode->imageWidth;
       currentMode->pixmapHeight = currentMode->imageHeight;
-      currentMode->maxViewportX = currentMode->imageWidth - 
-	currentMode->viewportWidth;
+      currentMode->maxViewportX = currentMode->imageWidth - currentMode->viewportWidth;
       /* this might need to get clamped to some maximum */
-      currentMode->maxViewportY = currentMode->imageHeight -
-	currentMode->viewportHeight;
+      currentMode->maxViewportY = currentMode->imageHeight - currentMode->viewportHeight;
       oneMore = FALSE;
       goto SECOND_PASS;
     } else {
       currentMode->bytesPerScanline = ((pScrn->displayWidth * pTDFX->cpp) + 3) & ~3L;
       currentMode->imageWidth = pScrn->displayWidth;
-      currentMode->imageHeight =  pScrn->virtualY;
+      currentMode->imageHeight = pScrn->virtualY;
       currentMode->pixmapWidth = currentMode->imageWidth;
       currentMode->pixmapHeight = currentMode->imageHeight;
-      currentMode->maxViewportX = currentMode->imageWidth - 
-	currentMode->viewportWidth;
+      currentMode->maxViewportX = currentMode->imageWidth - currentMode->viewportWidth;
       /* this might need to get clamped to some maximum */
-      currentMode->maxViewportY = currentMode->imageHeight -
-	currentMode->viewportHeight;
+      currentMode->maxViewportY = currentMode->imageHeight - currentMode->viewportHeight;
     }	    
     
     pMode = pMode->next;
@@ -125,25 +122,26 @@ SECOND_PASS:
 static Bool
 TDFX_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
 {
-   static int OldDisplayWidth[MAXSCREENS];
+   static DisplayModePtr OldModes[MAXSCREENS];
    int index = pScrn->pScreen->myNum;
 
    TDFXPtr pTDFX = TDFXPTR(pScrn);
 
    if (!pMode) { /* restore the original mode */
      /* put the ScreenParameters back */
-     pScrn->displayWidth = OldDisplayWidth[index];
-     TDFXSwitchMode(index, pScrn->currentMode, 0);
-     pTDFX->DGAactive = FALSE;
+     if (pTDFX->DGAactive) {
+       TDFXSwitchMode(index, OldModes[index], 0);
+       TDFXAdjustFrame(pScrn->pScreen->myNum, 0, 0, 0);
+       pTDFX->DGAactive = FALSE;
+     }
    } else {
-     if (!pTDFX->DGAactive) {  /* save the old parameters */
-       OldDisplayWidth[index] = pScrn->displayWidth;
-       
+     /* save the old ScreenParameters */
+     if (!pTDFX->DGAactive) {
+       OldModes[index] = pScrn->currentMode;
        pTDFX->DGAactive = TRUE;
      }
 
      pScrn->displayWidth = pMode->bytesPerScanline / pTDFX->cpp;
-
      TDFXSwitchMode(index, pMode->mode, 0);
    }
    
@@ -162,9 +160,14 @@ static void
 TDFX_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
 {
    TDFXPtr pTDFX = TDFXPTR(pScrn);
+   vgaHWPtr hwp = VGAHWPTR(pScrn);
 
    TDFXAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
-   pTDFX->DGAViewportStatus = 0;  /* TDFXAdjustFrame loops until finished */
+
+   while (hwp->readST01(hwp) & 0x08);
+   while (!(hwp->readST01(hwp) & 0x08));
+
+   pTDFX->DGAViewportStatus = 0; 
 }
 
 static void 
@@ -189,10 +192,8 @@ TDFX_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h,
     int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
     int ydir = (srcy < dsty) ? -1 : 1;
 
-    (*pTDFX->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, 
-						       GXcopy, ~0, -1);
-    (*pTDFX->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy, 
-							 dstx, dsty, w, h);
+    (*pTDFX->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, GXcopy, ~0, -1);
+    (*pTDFX->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy, dstx, dsty, w, h);
   }
 }
 
@@ -224,7 +225,7 @@ TDFX_OpenFramebuffer(
     *name = NULL; 		/* no special device */
     *mem = (unsigned char*)pTDFX->LinearAddr[0];
     *size = pTDFX->FbMapSize;
-    *offset = 0;
+    *offset =  0;
     *flags = DGA_NEED_ROOT;
 
     return TRUE;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index 8c5831420..f5e7306a2 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -31,6 +31,8 @@ static Bool TDFXDRICloseFullScreen(ScreenPtr pScreen);
 static void TDFXDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index);
 static void TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, 
 			       RegionPtr prgnSrc, CARD32 index);
+static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
+static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
 
 static Bool
 TDFXInitVisualConfigs(ScreenPtr pScreen)
@@ -375,6 +377,8 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
   pDRIInfo->MoveBuffers = TDFXDRIMoveBuffers;
   pDRIInfo->OpenFullScreen = TDFXDRIOpenFullScreen;
   pDRIInfo->CloseFullScreen = TDFXDRICloseFullScreen;
+  pDRIInfo->TransitionTo2d = TDFXDRITransitionTo2d;
+  pDRIInfo->TransitionTo3d = TDFXDRITransitionTo3d;
   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
 
   if (!DRIScreenInit(pScreen, pDRIInfo, &pTDFX->drmSubFD)) {
@@ -704,3 +708,42 @@ TDFXDRICloseFullScreen(ScreenPtr pScreen)
   return TRUE;
 }
 
+
+static void
+TDFXDRITransitionTo2d(ScreenPtr pScreen)
+{
+  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+  TDFXPtr pTDFX = TDFXPTR(pScrn);
+
+  xf86FreeOffscreenArea(pTDFX->reservedArea); 
+}
+
+
+static void
+TDFXDRITransitionTo3d(ScreenPtr pScreen)
+{
+  ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+  TDFXPtr pTDFX = TDFXPTR(pScrn);
+  FBAreaPtr pArea;
+
+  if(pTDFX->overlayBuffer) {
+	xf86FreeOffscreenLinear(pTDFX->overlayBuffer);
+	pTDFX->overlayBuffer = NULL;
+  }
+
+  if(pTDFX->textureBuffer) {
+	xf86FreeOffscreenArea(pTDFX->textureBuffer);
+	pTDFX->textureBuffer = NULL;
+  }
+
+  xf86PurgeUnlockedOffscreenAreas(pScreen);
+  
+  /* this is an ugly hack! isnt there a resize? */
+  pArea = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth,
+				    pTDFX->pixmapCacheLinesMin,
+				    pScrn->displayWidth, NULL, NULL, NULL);
+  pTDFX->reservedArea = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth,
+			pTDFX->pixmapCacheLinesMax - pTDFX->pixmapCacheLinesMin,
+			pScrn->displayWidth, NULL, NULL, NULL);
+  xf86FreeOffscreenArea(pArea);
+}
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
index a39c9b780..e3c72918d 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
@@ -89,6 +89,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tdfx.h"
 
 #include "miscstruct.h"
+#include "dixstruct.h"
 
 #include "xf86xv.h"
 #include "Xv.h"
@@ -135,6 +136,8 @@ static void TDFXFreeScreen(int scrnIndex, int flags);
 static int TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool
 		       verbose, int flags);
 
+static void TDFXBlockHandler(int, pointer, pointer, pointer);
+
 #ifdef DPMSExtension
 /* Switch to various Display Power Management System levels */
 static void TDFXDisplayPowerManagementSet(ScrnInfoPtr pScrn, 
@@ -178,14 +181,22 @@ typedef enum {
   OPTION_NOACCEL,
   OPTION_SW_CURSOR,
   OPTION_USE_PIO,
-  OPTION_NO_SLI
+  OPTION_SHOWCACHE,
+  OPTION_VIDEO_KEY,
+  OPTION_NO_SLI,
+  OPTION_OVERLAY_XV,
+  OPTION_TEXTURE_XV
 } TDFXOpts;
 
 static OptionInfoRec TDFXOptions[] = {
   { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
   { OPTION_USE_PIO, "UsePIO", OPTV_BOOLEAN, {0}, FALSE},
+  { OPTION_SHOWCACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE},
+  { OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE},
   { OPTION_NO_SLI, "NoSLI", OPTV_BOOLEAN, {0}, FALSE},
+  { OPTION_OVERLAY_XV, "OverlayXvideo", OPTV_BOOLEAN, {1}, TRUE},
+  { OPTION_TEXTURE_XV, "TextureXvideo", OPTV_BOOLEAN, {1}, TRUE},
   { -1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
@@ -399,7 +410,7 @@ TDFXProbeDDC(ScrnInfoPtr pScrn, int index)
 #endif
     {
 	pVbe =  VBEInit(NULL,index);
-	vbeDoEDID(pVbe, NULL);
+	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
     }
 }
 
@@ -949,6 +960,30 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags)
     }
   }
 
+  if (!xf86GetOptValBool(TDFXOptions, OPTION_SHOWCACHE, &(pTDFX->ShowCache))) {
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ShowCache %s\n", pTDFX->ShowCache ? "Enabled" : "Disabled");
+  } else {
+    pTDFX->ShowCache = FALSE;
+  }
+
+  if (xf86GetOptValBool(TDFXOptions, OPTION_OVERLAY_XV, &(pTDFX->OverlayXvideo))) {
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Overlay Xvideo Adaptor %s\n", pTDFX->OverlayXvideo ? "Enabled" : "Disabled");
+  } else {
+    pTDFX->OverlayXvideo = TRUE;
+  }
+
+  if (xf86GetOptValBool(TDFXOptions, OPTION_TEXTURE_XV, &(pTDFX->TextureXvideo))) {
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Texture Xvideo Adaptor %s\n", pTDFX->TextureXvideo ? "Enabled" : "Disabled");
+  } else {
+    pTDFX->TextureXvideo = TRUE;
+  }
+
+  if (xf86GetOptValInteger(TDFXOptions, OPTION_VIDEO_KEY, &(pTDFX->videoKey))) {
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", pTDFX->videoKey);
+  } else {
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key default 0x%x\n", pTDFX->videoKey = 0x1E);
+  }
+
   if (!xf86ReturnOptValBool(TDFXOptions, OPTION_SW_CURSOR, FALSE)) {
     if (!xf86LoadSubModule(pScrn, "ramdac")) {
       TDFXFreeRec(pScrn);
@@ -1440,6 +1475,7 @@ TDFXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
   int hd, hbs, hss, hse, hbe, ht, hskew;
   Bool dbl;
 
+  hd = hbs = hss = hse = hbe = ht = hskew = 0;
   hwp = VGAHWPTR(pScrn);
   pTDFX = TDFXPTR(pScrn);
 
@@ -1500,35 +1536,35 @@ TDFXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
 static void
 TDFXLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-		  short visualClass) {
+		  VisualPtr pVisual) {
   TDFXPtr pTDFX;
   int i, j, index, v, repeat, max;
 
   TDFXTRACE("TDFXLoadPalette16 start\n");
   pTDFX = TDFXPTR(pScrn);
+
   for (i=0; i<numColors; i++) {
     index=indices[i];
     v=(colors[index/2].red<<16)|(colors[index].green<<8)|colors[index/2].blue;
-    if (i<numColors-1) max=indices[i+1]<<2;
-    else max=256;
-    for (j=index<<2; j<max; j++) {
+    max=min((index+1)<<2, 256);
+    for (j = index<<2; j < max; j++)
+    {
       repeat=100;
       do {
 	TDFXWriteLongMMIO(pTDFX, DACADDR, j);
       } while (--repeat && TDFXReadLongMMIO(pTDFX, DACADDR)!=j);
       if (!repeat) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac index, "
-		   "bypassing CLUT\n");
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac index, bypassing CLUT\n");
 	pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
 	return;
       }
+
       repeat=100;
       do {
 	TDFXWriteLongMMIO(pTDFX, DACDATA, v);
       } while (--repeat && TDFXReadLongMMIO(pTDFX, DACDATA)!=v);
       if (!repeat) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac value, "
-		   "bypassing CLUT\n");
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Failed to set dac value, bypassing CLUT\n");
 	pTDFX->ModeReg.vidcfg |= SST_DESKTOP_CLUT_BYPASS;
 	return;
       }
@@ -1538,7 +1574,7 @@ TDFXLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 
 static void
 TDFXLoadPalette24(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-		  short visualClass) {
+		  VisualPtr pVisual) {
   TDFXPtr pTDFX;
   int i, index, v, repeat;
 
@@ -1635,11 +1671,8 @@ calcBufferSize(int xres, int yres, Bool tiled, int cpp)
 } /* calcBufferSize */
 
 static void allocateMemory(ScrnInfoPtr pScrn) {
-  TDFXPtr pTDFX;
-  int memRemaining, texSize, fifoSize, screenSizeInTiles;
-
-  pTDFX = TDFXPTR(pScrn);
-  pTDFX->stride = pScrn->displayWidth*pTDFX->cpp;
+  TDFXPtr pTDFX = TDFXPTR(pScrn);
+  int memRemaining, fbSize, cursorSize, fifoSize, screenSizeInTiles;
 
   if (pTDFX->cpp!=3) {
     screenSizeInTiles=calcBufferSize(pScrn->virtualX, pScrn->virtualY,
@@ -1658,7 +1691,7 @@ static void allocateMemory(ScrnInfoPtr pScrn) {
   /* it to be on an *odd* page boundary.    */
   pTDFX->depthOffset = (memRemaining - screenSizeInTiles) &~ 0xFFF;
   if ((pTDFX->depthOffset & (0x1 << 12)) == 0) {
-#if	0
+#if	1
       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                  "Changing depth offset from 0x%08x to 0x%08x\n",
                  pTDFX->depthOffset,
@@ -1670,7 +1703,7 @@ static void allocateMemory(ScrnInfoPtr pScrn) {
   /* to be on an *even* page boundary.      */
   pTDFX->backOffset = (pTDFX->depthOffset - screenSizeInTiles) &~ 0xFFF;
   if (pTDFX->backOffset & (0x1 << 12)) {
-#if	0
+#if	1
       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                  "Changing back offset from 0x%08x to 0x%08x\n",
                  pTDFX->backOffset,
@@ -1678,52 +1711,59 @@ static void allocateMemory(ScrnInfoPtr pScrn) {
 #endif
       pTDFX->backOffset -= (0x1 << 12);
   }
-  /* Now, place the front buffer, forcing   */
-  /* it to be on a page boundary too, just  */
-  /* for giggles.                           */
-  pTDFX->fbOffset
-      = (pTDFX->backOffset - (pScrn->virtualY+PIXMAP_CACHE_LINES)*pTDFX->stride) &~ 0xFFF;
   /* Give the cmd fifo at least             */
   /* CMDFIFO_PAGES pages, but no more than  */
   /* 255.                                   */
   fifoSize = ((255 <= CMDFIFO_PAGES) ? 255 : CMDFIFO_PAGES) << 12;
+  fbSize = (pScrn->virtualY + pTDFX->pixmapCacheLinesMin) * pTDFX->stride;
+  cursorSize = 4096;
   /* We give 4096 bytes to the cursor, fifoSize to the */
   /* FIFO, and everything to textures.                 */
   /* Bump everything by 64k to move it past VGA memory */
-  texSize = (pTDFX->fbOffset - fifoSize - 4096 - 64*1024);
-  pTDFX->texOffset = pTDFX->fbOffset - texSize + 64*1024;
-  pTDFX->texSize = texSize;
-  pTDFX->fifoOffset = 4096+64*1024;
+  pTDFX->cursorOffset = 64*1024;
+  pTDFX->fifoOffset = pTDFX->cursorOffset + cursorSize;
   pTDFX->fifoSize = fifoSize;
-  pTDFX->cursorOffset = 0+64*1024;
-#if	0
+  /* Now, place the front buffer, forcing   */
+  /* it to be on a page boundary too, just  */
+  /* for giggles.                           */
+  pTDFX->fbOffset = (pTDFX->fifoOffset + pTDFX->fifoSize) &~ 0xFFF;
+  pTDFX->texOffset = pTDFX->fbOffset + fbSize;
+  pTDFX->texSize = pTDFX->backOffset - pTDFX->texOffset;
+
+  if (pTDFX->texSize <= 0) {
+    pTDFX->backOffset = -1;
+    pTDFX->depthOffset = -1;
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "No Texture Memory available, disabling DRI\n");
+  } else {
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Texture Memory %0.02f MB\n", pTDFX->texSize / 1024.0 / 1024.0);
+  }
+
+#if	1
   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
              "Cursor Offset: [0x%08X,0x%08X)\n",
              pTDFX->cursorOffset,
-             pTDFX->cursorOffset+1024);
+             pTDFX->cursorOffset + cursorSize);
   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
              "Fifo Offset: [0x%08X, 0x%08X)\n",
              pTDFX->fifoOffset,
-             pTDFX->fifoOffset+fifoSize);
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-             "Texture Offset: [0x%08X, 0x%08X)\n",
-             pTDFX->texOffset,
-             pTDFX->texOffset + texSize);
+             pTDFX->fifoOffset + pTDFX->fifoSize);
   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
              "Front Buffer Offset: [0x%08X, 0x%08X)\n",
              pTDFX->fbOffset,
-             pTDFX->fbOffset + (pScrn->virtualY+PIXMAP_CHACHE_LINES)*pTDFX->stride);
+             pTDFX->fbOffset + fbSize);
+  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+             "Texture Offset: [0x%08X, 0x%08X)\n",
+             pTDFX->texOffset,
+             pTDFX->texOffset + pTDFX->texSize);
   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
              "BackOffset: [0x%08X, 0x%08X)\n",
              pTDFX->backOffset,
-             pTDFX->backOffset+screenSizeInTiles);
+             pTDFX->backOffset + screenSizeInTiles);
   xf86DrvMsg(pScrn->scrnIndex, X_INFO,
              "DepthOffset: [0x%08X, 0x%08X)\n",
              pTDFX->depthOffset,
-             pTDFX->depthOffset+screenSizeInTiles);
+             pTDFX->depthOffset + screenSizeInTiles);
 #endif	/* 0/1 */
-  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Textures Memory %0.02f MB\n",
-	     (float)texSize/1024.0/1024.0);
 }
 
 static Bool
@@ -1734,7 +1774,6 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
   VisualPtr visual;
   int maxy;
   BoxRec MemBox;
-  RegionRec MemRegion;
 
   TDFXTRACE("TDFXScreenInit start\n");
   pScrn = xf86Screens[pScreen->myNum];
@@ -1748,6 +1787,10 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
   vgaHWGetIOBase(hwp);
   if (!vgaHWMapMem(pScrn)) return FALSE;
 
+  /* we want at least enough pixmap cache to do DVD */
+  pTDFX->stride = pScrn->displayWidth*pTDFX->cpp;
+  pTDFX->pixmapCacheLinesMin = ((720*480*2) + pTDFX->stride - 1) / pTDFX->stride;
+
   allocateMemory(pScrn);
 
 #if 0
@@ -1769,13 +1812,30 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
     return FALSE;
   }
 
-  maxy=pScrn->virtualY+PIXMAP_CACHE_LINES;
-  MemBox.y1 = pScrn->virtualY;
+  pTDFX->pixmapCacheLinesMax = (pTDFX->backOffset - pTDFX->fbOffset) / pTDFX->stride;
+  if(pTDFX->ChipType < PCI_CHIP_VOODOO5) {
+    if (pTDFX->pixmapCacheLinesMax > 2048)
+      pTDFX->pixmapCacheLinesMax = 2048;
+  } else {
+    if (pTDFX->pixmapCacheLinesMax > 4095)
+      pTDFX->pixmapCacheLinesMax = 4095;
+  }
+
+  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    "%d pixmap cache lines for 2D/video when 3D inactive\n",
+    pTDFX->pixmapCacheLinesMax);
+  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+    "%d pixmap cache lines for 2D/video when 3D active\n",
+    pTDFX->pixmapCacheLinesMin);
+
+  /* region the whole memory (framebuffer+pixmapcache) and let 
+   * xf86InitFBManager do the visible region subtraction
+   */
   MemBox.x1 = 0;
+  MemBox.y1 = 0;
   MemBox.x2 = pScrn->displayWidth;
-  MemBox.y2 = maxy;
-
-  pTDFX->maxClip=((pScrn->virtualX+1)&0xFFF) | (((maxy+1)&0xFFF)<<16);
+  MemBox.y2 = pTDFX->pixmapCacheLinesMax;
+  pTDFX->maxClip = (MemBox.x2) | (MemBox.y2 << 16);
 
   TDFXSave(pScrn);
   if (!TDFXModeInit(pScrn, pScrn->currentMode)) return FALSE;
@@ -1797,8 +1857,11 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
    * is called.   fbScreenInit will eventually call into the drivers
    * InitGLXVisuals call back.
    */
-  if (!pTDFX->NoAccel)
-    pTDFX->directRenderingEnabled = TDFXDRIScreenInit(pScreen);
+  if (!pTDFX->NoAccel) {
+    if ((pTDFX->backOffset != -1) && (pTDFX->depthOffset != -1)) {
+      pTDFX->directRenderingEnabled = TDFXDRIScreenInit(pScreen);
+    }
+  }
 #endif
 
   switch (pScrn->bitsPerPixel) {
@@ -1840,13 +1903,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
 
   TDFXDGAInit(pScreen);
 
-  REGION_INIT(pScreen, &MemRegion, &MemBox, 1);
-  if (!xf86InitFBManagerRegion(pScreen, &MemRegion)) {
-    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to init memory manager\n");
-    REGION_UNINIT(pScreen, &MemRegion);
-    return FALSE;
-  }
-  REGION_UNINIT(pScreen, &MemRegion);
+  xf86InitFBManager(pScreen, &MemBox);
 
   if (!pTDFX->NoAccel) {
     if (!TDFXAccelInit(pScreen)) {
@@ -1912,6 +1969,9 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
   pTDFX->CloseScreen = pScreen->CloseScreen;
   pScreen->CloseScreen = TDFXCloseScreen;
 
+  pTDFX->BlockHandler = pScreen->BlockHandler;
+  pScreen->BlockHandler = TDFXBlockHandler;
+
   if (serverGeneration == 1)
     xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
@@ -1936,6 +1996,10 @@ TDFXAdjustFrame(int scrnIndex, int x, int y, int flags) {
   TDFXTRACE("TDFXAdjustFrame start\n");
   pScrn = xf86Screens[scrnIndex];
   pTDFX = TDFXPTR(pScrn);
+
+  if (pTDFX->ShowCache && y && pScrn->vtSema)
+    y += pScrn->virtualY - 1;
+
   tdfxReg = &pTDFX->ModeReg;
   tdfxReg->startaddr = pTDFX->fbOffset+y*pTDFX->stride+(x*pTDFX->cpp);
   TDFXTRACE("TDFXAdjustFrame to x=%d y=%d offset=%d\n", x, y, tdfxReg->startaddr);
@@ -1945,14 +2009,15 @@ TDFXAdjustFrame(int scrnIndex, int x, int y, int flags) {
 static Bool
 TDFXEnterVT(int scrnIndex, int flags) {
   ScrnInfoPtr pScrn;
-#ifdef XF86DRI
   ScreenPtr pScreen;
+#ifdef XF86DRI
   TDFXPtr pTDFX;
 #endif
 
   TDFXTRACE("TDFXEnterVT start\n");
   pScrn = xf86Screens[scrnIndex];
-  InstallFifo(pScrn);
+  pScreen = screenInfo.screens[scrnIndex];
+  TDFXInitFifo(pScreen);
 #ifdef XF86DRI
   pTDFX = TDFXPTR(pScrn);
   if (pTDFX->directRenderingEnabled) {
@@ -2029,9 +2094,22 @@ TDFXCloseScreen(int scrnIndex, ScreenPtr pScreen)
   if (pTDFX->scanlineColorExpandBuffers[1])
     xfree(pTDFX->scanlineColorExpandBuffers[1]);
   pTDFX->scanlineColorExpandBuffers[1]=0;
+
+  if (pTDFX->overlayAdaptor) {
+    xfree(pTDFX->overlayAdaptor->pPortPrivates[0].ptr);
+    xf86XVFreeVideoAdaptorRec(pTDFX->overlayAdaptor);
+    pTDFX->overlayAdaptor = NULL;
+  }
+  
+  if (pTDFX->textureAdaptor) {
+    xfree(pTDFX->textureAdaptor->pPortPrivates[0].ptr); /* FIXME: use loop */
+    xf86XVFreeVideoAdaptorRec(pTDFX->textureAdaptor);
+    pTDFX->textureAdaptor = NULL;
+  }
   
   pScrn->vtSema=FALSE;
 
+  pScreen->BlockHandler = pTDFX->BlockHandler;
   pScreen->CloseScreen = pTDFX->CloseScreen;
   return (*pScreen->CloseScreen)(scrnIndex, pScreen);
 }
@@ -2077,7 +2155,7 @@ TDFXBlankScreen(ScrnInfoPtr pScrn, Bool unblank)
     scrn |= 0x20;                     /* blank screen */
   }
 
-  vgaHWSeqReset(hwp, TRUE); 
+  vgaHWSeqReset(hwp, TRUE);
   hwp->writeSeq(hwp, 0x01, scrn);     /* change mode */
   vgaHWSeqReset(hwp, FALSE);
 }
@@ -2101,6 +2179,22 @@ TDFXSaveScreen(ScreenPtr pScreen, int mode)
   return TRUE;
 }                                                                             
 
+static void
+TDFXBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr   pScreen = screenInfo.screens[i];
+    ScrnInfoPtr pScrn   = xf86Screens[i];
+    TDFXPtr     pTDFX   = TDFXPTR(pScrn);
+
+    pScreen->BlockHandler = pTDFX->BlockHandler;
+    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+    pScreen->BlockHandler = TDFXBlockHandler;
+
+    if(pTDFX->VideoTimerCallback) {
+        (*pTDFX->VideoTimerCallback)(pScrn, currentTime.milliseconds);
+    }
+}
+
 #ifdef DPMSExtension
 static void
 TDFXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c
index 58e49d1cf..1e590d546 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.13 2000/12/15 15:19:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.11 2000/12/01 14:29:00 dawes Exp $ */
 
 
 #include "xf86.h"
@@ -11,13 +11,19 @@
 /*
   Memory layout of card is as follows:
 
-  000000-003fff: Cursor 
-  001000-xxxxxx: Fifo (Min of CMDFIFO pages)
-  xxxxxx-420fff: Texture maps
-  421000- A-1  : Framebuffer
-   A    - B-1  : Offscreen pixmaps
-   B    - C-1  : Back buffer
-   C    - D-1  : Z buffer
+  000000-00ffff: VGA memory
+  010000-013fff: Cursor 
+  011000-xxxxxx: Fifo (Min of CMDFIFO pages)
+  xxxxxx- A-1  : Front Buffer (framebuffer)
+   A    - B-1  : Pixmap Cache (framebuffer)
+   B    - C-1  : Texture Memory
+   C    - D-1  : Back Buffer
+   D    - E-1  : Depth Buffer
+
+  NB: pixmap cache usually butts right up against texture memory. when
+  3d is disabled (via Transition2D) then the pixmap cache is increased
+  to overlap the texture memory. maximum pixmap cache of 4095 lines on
+  voodoo5 and 2048 on voodoo3/4 applies.
 */
 
 void TDFXSendNOPFifo3D(ScrnInfoPtr pScrn)
@@ -117,9 +123,9 @@ void TDFXResetFifo(ScrnInfoPtr pScrn)
 static void TDFXSyncFifo(ScrnInfoPtr pScrn)
 {
   TDFXPtr pTDFX;
-  int i, cnt;
+  int i, cnt, resets=0;
   int stat;
-  long start_sec, end_sec, dummy;
+  long start_sec, end_sec, dummy, readptr;
 
   TDFXTRACEACCEL("TDFXSyncFifo start\n");
   pTDFX=TDFXPTR(pScrn);
@@ -127,7 +133,9 @@ static void TDFXSyncFifo(ScrnInfoPtr pScrn)
   i=0;
   cnt=0;
   start_sec=0;
+  readptr=TDFXReadLongMMIO(pTDFX, SST_FIFO_RDPTRL0);
   do {
+    readptr=TDFXReadLongMMIO(pTDFX, SST_FIFO_RDPTRL0);
     stat=TDFXReadLongMMIO(pTDFX, 0);
     if (stat&SST_BUSY) i=0; else i++;
     cnt++;
@@ -137,7 +145,17 @@ static void TDFXSyncFifo(ScrnInfoPtr pScrn)
       } else {
 	getsecs(&end_sec, &dummy);
 	if (end_sec-start_sec>3) {
-	  TDFXResetFifo(pScrn);
+	  dummy=TDFXReadLongMMIO(pTDFX, SST_FIFO_RDPTRL0);
+	  if (dummy==readptr) {
+	    TDFXResetFifo(pScrn);
+	    readptr=dummy;
+	    resets++;
+	    if (resets==3) {
+	      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+			 "Board is not responding.\n");
+	      return;
+	    }
+	  }
 	  start_sec=0;
         }
       }
@@ -237,24 +255,6 @@ void TDFXSwapContextFifo(ScreenPtr pScreen)
     pTDFX->fifoSlots = pTDFX->fifoEnd-pTDFX->fifoPtr-8;
 }    
 
-void TDFXLostContext(ScreenPtr pScreen)
-{
-  ScrnInfoPtr pScrn;
-  TDFXPtr pTDFX;
-  TDFXSAREAPriv *sPriv;
-
-  pScrn = xf86Screens[pScreen->myNum];
-  pTDFX=TDFXPTR(pScrn);
-  sPriv=(TDFXSAREAPriv*)DRIGetSAREAPrivate(pScreen);
-  if (!sPriv) return;
-  if (sPriv->fifoPtr!=(((unsigned char*)pTDFX->fifoPtr)-pTDFX->FbBase) ||
-      sPriv->fifoRead!=(((unsigned char*)pTDFX->fifoRead)-pTDFX->FbBase)) {
-    sPriv->fifoPtr=(((unsigned char*)pTDFX->fifoPtr)-pTDFX->FbBase);
-    sPriv->fifoRead=(((unsigned char*)pTDFX->fifoRead)-pTDFX->FbBase);
-    sPriv->fifoOwner=DRIGetContext(pScreen);
-    /* ErrorF("Out FifoPtr=%d FifoRead=%d\n", sPriv->fifoPtr, sPriv->fifoRead); */
-  }
-}
 #endif
 
 static void 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
index 8480de20a..d63592085 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c
@@ -1,85 +1,134 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c,v 1.5 2000/12/08 21:53:37 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c,v 1.2 2000/12/02 15:30:57 tsi Exp $ */
 
-/* Adapted from ../mga/mga_video.c */
+#ifndef XvExtension
+void TDFXInitVideo(ScreenPtr pScreen) {}
+void TDFXCloseVideo(ScreenPtr pScreen) {}
+#else
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86_ansic.h"
-#include "compiler.h"
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-#include "xf86fbman.h"
-#include "regionstr.h"
-
 #include "tdfx.h"
+#include "dixstruct.h"
 
-#include "xf86xv.h"
 #include "Xv.h"
-#include "xaa.h"
-#include "xaalocal.h"
-#include "dixstruct.h"
 #include "fourcc.h"
 
+static Atom xvColorKey, xvFilterQuality;
+
 /* These should move into tdfxdefs.h with better names */
-#define YUV_Y_BASE 0xC00000
-#define YUV_U_BASE 0xD00000
-#define YUV_V_BASE 0xE00000
+#define YUV_Y_BASE              0xC00000
+#define YUV_U_BASE              0xD00000
+#define YUV_V_BASE              0xE00000
 
-#define SST_2D_FORMAT_YUYV  0x8
-#define SST_2D_FORMAT_UYVY  0x9
+#define SST_2D_FORMAT_YUYV      0x8
+#define SST_2D_FORMAT_UYVY      0x9
 
 #define YUVBASEADDR             0x80100
-/* This should move to tdfx.h
- * Only one port for now due to need for better memory allocation. */
-#define TDFX_MAX_PORTS 1
-
 #define YUVSTRIDE               0x80104
+#define VIDPROCCFGMASK          0xa2e3eb6c
 
-#ifndef XvExtension
-void TDFXInitVideo(ScreenPtr pScreen) {}
-#else
+#define OFF_DELAY               250  /* milliseconds */
+#define FREE_DELAY              15000
+
+#define OFF_TIMER               0x01
+#define FREE_TIMER              0x02
+#define CLIENT_VIDEO_ON         0x04
+#define TIMER_MASK              (OFF_TIMER | FREE_TIMER)
+
+#define TDFX_MAX_OVERLAY_PORTS  1
+#define TDFX_MAX_TEXTURE_PORTS  32
+
+/* Doesn't matter what screen we use */
+#define DummyScreen             screenInfo.screens[0]
 
+/* Needed for attribute atoms */
+#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
+
+/*
+ * PROTOTYPES
+ */
 
 void TDFXInitVideo(ScreenPtr pScreen);
-void TDFXCloseVideo (ScreenPtr pScreen);
-
-static XF86VideoAdaptorPtr TDFXSetupImageVideo(ScreenPtr);
-static int  TDFXSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
-static int  TDFXGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
-
-static void TDFXStopVideo(ScrnInfoPtr, pointer, Bool);
-static void TDFXQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, 
-			unsigned int *, unsigned int *, pointer);
-static int  TDFXPutImage(ScrnInfoPtr, short, short, short, short, short, 
-			short, short, short, int, unsigned char*, short, 
-			short, Bool, RegionPtr, pointer);
-#if 0
-/* This isn't done yet, but eventually it will put images to the 
- * video overlay. */
-static int TDFXPutImageOverlay(ScrnInfoPtr pScrn, short, short, 
-			       short, short, short, short, 
-			       short, short, int, unsigned char*, 
-			       short, short, Bool, RegionPtr , pointer);
-#endif
-
-static int  TDFXQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, 
-			unsigned short *,  int *, int *);
-
-/* These function is from tdfx_accel.c */
-extern void TDFXFirstSync(ScrnInfoPtr pScrn);
+void TDFXCloseVideo(ScreenPtr pScreen);
 
-static FBAreaPtr
-TDFXAllocateOffscreenBuffer (ScrnInfoPtr pScrn, int id, int width, int height);
+static FBAreaPtr TDFXAllocateMemoryArea (ScrnInfoPtr pScrn, FBAreaPtr area, int width, int height);
+static FBLinearPtr TDFXAllocateMemoryLinear (ScrnInfoPtr pScrn, FBLinearPtr linear, int size);
+static void TDFXVideoTimerCallback(ScrnInfoPtr pScrn, Time time);
 
-static void
-TDFXDeallocateOffscreenBuffer (ScrnInfoPtr pScrn, int id);
+static XF86VideoAdaptorPtr TDFXSetupImageVideoTexture(ScreenPtr);
+static int  TDFXSetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
+static int  TDFXGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
+static int  TDFXPutImageTexture(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+static void TDFXStopVideoTexture(ScrnInfoPtr, pointer, Bool);
+
+static XF86VideoAdaptorPtr TDFXSetupImageVideoOverlay(ScreenPtr);
+static int  TDFXSetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
+static int  TDFXGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
+static int  TDFXPutImageOverlay(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+static void TDFXStopVideoOverlay(ScrnInfoPtr, pointer, Bool);
+static void TDFXResetVideoOverlay(ScrnInfoPtr);
+
+static void TDFXQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
+static int  TDFXQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *,  int *, int *);
+
+/*
+ * ADAPTOR INFORMATION
+ */
+
+static XF86VideoEncodingRec OverlayEncoding[] =
+{
+   { 0, "XV_IMAGE", 2048, 2048, {1, 1} }
+};
+
+static XF86VideoEncodingRec TextureEncoding[] =
+{
+   { 0, "XV_IMAGE", 1024, 1024, {1, 1} }
+};
+
+static XF86VideoFormatRec OverlayFormats[] = 
+{
+   {8, TrueColor}, {8, DirectColor}, {8, PseudoColor},
+   {8, GrayScale}, {8, StaticGray}, {8, StaticColor},
+   {15, TrueColor}, {16, TrueColor}, {24, TrueColor},
+   {15, DirectColor}, {16, DirectColor}, {24, DirectColor}
+};
+
+static XF86VideoFormatRec TextureFormats[] = 
+{
+   {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+};
+
+static XF86AttributeRec OverlayAttributes[] =
+{
+   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
+   {XvSettable | XvGettable, 0, 1, "XV_FILTER_QUALITY"}
+};
+
+static XF86AttributeRec TextureAttributes[] =
+{
+   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
+   {XvSettable | XvGettable, 0, 1, "XV_FILTER_QUALITY"}
+};
+
+static XF86ImageRec OverlayImages[] =
+{
+  XVIMAGE_YUY2, XVIMAGE_UYVY, XVIMAGE_YV12, XVIMAGE_I420
+};
+
+static XF86ImageRec TextureImages[] =
+{
+  XVIMAGE_YV12, XVIMAGE_I420
+};
+
+/*
+ * COMMON SETUP FUNCTIONS
+ */
 
 void TDFXInitVideo(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
-    XF86VideoAdaptorPtr newAdaptor = NULL;
+    XF86VideoAdaptorPtr newOverlayAdaptor = NULL;
+    XF86VideoAdaptorPtr newTextureAdaptor = NULL;
     TDFXPtr pTDFX = TDFXPTR(pScrn);
     int num_adaptors;
 
@@ -87,685 +136,997 @@ void TDFXInitVideo(ScreenPtr pScreen)
     if(pTDFX->cpp == 1)
       return;
     
-    newAdaptor = TDFXSetupImageVideo(pScreen);
-
-    /* Initialize the offscreen buffer */
-    pTDFX->offscreenYUVBuf = 0;
-
+    /* Start with the generic adaptors */
     num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
 
-    if(newAdaptor) {
-	if(!num_adaptors) {
-	    num_adaptors = 1;
-	    adaptors = &newAdaptor;
-	} else {
-	    newAdaptors =  /* need to free this someplace */
-		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-	    if(newAdaptors) {
-		memcpy(newAdaptors, adaptors, num_adaptors * 
-					sizeof(XF86VideoAdaptorPtr));
-		newAdaptors[num_adaptors] = newAdaptor;
-		adaptors = newAdaptors;
-		num_adaptors++;
-	    }
-	}
+    /* Overlay adaptor */
+    if(pTDFX->AccelInfoRec && pTDFX->AccelInfoRec->FillSolidRects)
+        newOverlayAdaptor = TDFXSetupImageVideoOverlay(pScreen);
+
+    /* Texture adaptor */
+    if(pTDFX->AccelInfoRec && pTDFX->AccelInfoRec->FillSolidRects)
+        newTextureAdaptor = TDFXSetupImageVideoTexture(pScreen);
+
+    /* Add the overlay adaptor to the list */
+    if(newOverlayAdaptor) {
+        newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+        if(newAdaptors) {
+            if (num_adaptors) memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
+            newAdaptors[num_adaptors] = newOverlayAdaptor;
+            adaptors = newAdaptors;     /* FIXME: leak? */
+            num_adaptors++;
+        }
     }
 
-    if(num_adaptors)
-    {
-      xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+    /* Add the texture adaptor to the list */
+    if(newTextureAdaptor) {
+        newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+        if(newAdaptors) {
+            if (num_adaptors) memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
+            newAdaptors[num_adaptors] = newTextureAdaptor;
+            adaptors = newAdaptors;     /* FIXME: leak? */
+            num_adaptors++;
+        }
     }
 
+    if(num_adaptors)
+        xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+
     if(newAdaptors)
-	xfree(newAdaptors);
+        xfree(newAdaptors);
 }
 
+
 void TDFXCloseVideo (ScreenPtr pScreen)
 {
-
 }
 
-/* client libraries expect an encoding */
-static XF86VideoEncodingRec DummyEncoding[1] =
+
+static XF86VideoAdaptorPtr
+TDFXAllocAdaptor(ScrnInfoPtr pScrn, int numberPorts)
 {
-  {   /* blit limit */
-   0,
-   "XV_IMAGE",
-   1024, 0,   /* Height is a limitation of pixmap space, and filled in later. */
-   {1, 1}
- }
-};
+    XF86VideoAdaptorPtr adapt;
+    TDFXPtr pTDFX = TDFXPTR(pScrn);
+    TDFXPortPrivPtr pPriv;
+    int i;
 
-#define NUM_FORMATS_OVERLAY 3
+    if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
+        return NULL;
 
-static XF86VideoFormatRec Formats[NUM_FORMATS_OVERLAY] = 
-{
-   {15, TrueColor}, {16, TrueColor}, {24, TrueColor},
-};
+    if(!(pPriv = xcalloc(1, sizeof(TDFXPortPrivRec) + numberPorts * sizeof(DevUnion))))
+    {
+        xfree(adapt);
+        return NULL;
+    }
 
-/* #define NUM_IMAGES 4*/
-#define NUM_IMAGES 2
+    adapt->pPortPrivates = (DevUnion*)(&pPriv[1]);
+    for(i = 0; i < numberPorts; i++)
+        adapt->pPortPrivates[i].val = i;
 
-static XF86ImageRec Images[NUM_IMAGES] =
-{
-  XVIMAGE_YV12,  /* YVU planar */
-  XVIMAGE_I420   /* YUV planar */
-#if 0
-  /* These could be supported (without a temp bufer) using the 
-   * host-to-screen-stretch */
-  XVIMAGE_YUY2,  /* YUYV packed */
-  XVIMAGE_UYVY   /* UYVY packed */
-#endif
-};
+    xvColorKey = MAKE_ATOM("XV_COLORKEY");              /* FIXME: twice, leak */
+    xvFilterQuality = MAKE_ATOM("XV_FILTER_QUALITY");   /* FIXME: twice, leak */
+
+    pPriv->colorKey = pTDFX->videoKey;
+    pPriv->videoStatus = 0;
+    pPriv->filterQuality = 1;
+
+    return adapt;
+}
 
 
 static XF86VideoAdaptorPtr
-TDFXAllocAdaptor(ScrnInfoPtr pScrn)
+TDFXSetupImageVideoOverlay(ScreenPtr pScreen)
 {
-    DevUnion *devUnions;
-    int i;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    TDFXPtr pTDFX = TDFXPTR(pScrn);
+    TDFXPortPrivPtr pPriv;
     XF86VideoAdaptorPtr adapt;
 
-    if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
-      return NULL;
-    /* Allocate a TDFX private structure */
-    /* There is no need for a TDFX private structure at this time.  But a 
-     * DevUnion has to be provided to the core Xv code. */
-    if (!(devUnions = xcalloc (1, sizeof (DevUnion) * TDFX_MAX_PORTS)))
-    {
-      xfree (adapt);
-      return NULL;
-     }
-    adapt->pPortPrivates = &devUnions[0];
-    
-    /* Fill in some of the DevUnion */
-    for (i = 0; i < TDFX_MAX_PORTS; i++)
-    {
-      adapt->pPortPrivates[i].val = i;
-      adapt->pPortPrivates[i].ptr = NULL;  /* No private data */
-    }
-    
-    return adapt;
-}
+    if (!pTDFX->OverlayXvideo)
+        return NULL;
 
+    if(!(adapt = TDFXAllocAdaptor(pScrn, TDFX_MAX_OVERLAY_PORTS)))
+        return NULL;
 
+    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
+    adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
+    adapt->name = "3dfx Video Overlay";
+    adapt->nPorts = TDFX_MAX_OVERLAY_PORTS;
+    adapt->nEncodings = sizeof(OverlayEncoding) / sizeof(XF86VideoEncodingRec);
+    adapt->pEncodings = OverlayEncoding;
+    adapt->nFormats = sizeof(OverlayFormats) / sizeof(XF86VideoFormatRec);
+    adapt->pFormats = OverlayFormats;
+    adapt->nAttributes = sizeof(OverlayAttributes) / sizeof(XF86AttributeRec);
+    adapt->pAttributes = OverlayAttributes;
+    adapt->nImages = sizeof(OverlayImages) / sizeof(XF86ImageRec);
+    adapt->pImages = OverlayImages;
+    adapt->PutVideo = NULL;
+    adapt->PutStill = NULL;
+    adapt->GetVideo = NULL;
+    adapt->GetStill = NULL;
+    adapt->StopVideo = TDFXStopVideoOverlay;
+    adapt->SetPortAttribute = TDFXSetPortAttributeOverlay;
+    adapt->GetPortAttribute = TDFXGetPortAttributeOverlay;
+    adapt->QueryBestSize = TDFXQueryBestSize;
+    adapt->PutImage = TDFXPutImageOverlay;
+    adapt->QueryImageAttributes = TDFXQueryImageAttributes;
 
-static XF86VideoAdaptorPtr 
-TDFXSetupImageVideo(ScreenPtr pScreen)
+    pPriv = (TDFXPortPrivPtr)(adapt->pPortPrivates[0].ptr);
+    REGION_INIT(pScreen, &(pPriv->clip), NullBox, 0);
+
+    pTDFX->overlayAdaptor = adapt;
+
+    TDFXResetVideoOverlay(pScrn);
+
+    return adapt;
+}
+
+static XF86VideoAdaptorPtr
+TDFXSetupImageVideoTexture(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    XF86VideoAdaptorPtr adapt;
     TDFXPtr pTDFX = TDFXPTR(pScrn);
+    XF86VideoAdaptorPtr adapt;
 
-    DummyEncoding[0].height = pTDFX->pixmapCacheLines;
+    if (!pTDFX->TextureXvideo)
+        return NULL;
 
-    adapt = TDFXAllocAdaptor(pScrn);
+    if(!(adapt = TDFXAllocAdaptor(pScrn, TDFX_MAX_TEXTURE_PORTS)))
+        return NULL;
 
     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-    /* Add VIDEO_OVERLAID_IMAGES if using the overlay */
     adapt->flags = 0;
-    adapt->name = "3dfx Accelerated Video Engine";
-    adapt->nEncodings = 1;
-    adapt->pEncodings = &DummyEncoding[0];
-    adapt->nFormats = NUM_FORMATS_OVERLAY;
-    adapt->pFormats = Formats;
-    adapt->nPorts = TDFX_MAX_PORTS;
-    adapt->nAttributes = 0;
-    adapt->pAttributes = NULL;
-    adapt->nImages = NUM_IMAGES;
-    adapt->pImages = Images;
-
-    /* XXX For now all I'm implementing is PutImage so that programs like OMS
-     * will work.  More will follow as I have time and need. */
+    adapt->name = "3dfx Video Texture";
+    adapt->nPorts = TDFX_MAX_TEXTURE_PORTS;
+    adapt->nEncodings = sizeof(TextureEncoding) / sizeof(XF86VideoEncodingRec);
+    adapt->pEncodings = TextureEncoding;
+    adapt->nFormats = sizeof(TextureFormats) / sizeof(XF86VideoFormatRec);
+    adapt->pFormats = TextureFormats;
+    adapt->nAttributes = sizeof(TextureAttributes) / sizeof(XF86AttributeRec);
+    adapt->pAttributes = TextureAttributes;
+    adapt->nImages = sizeof(TextureImages) / sizeof(XF86ImageRec);
+    adapt->pImages = TextureImages;
     adapt->PutVideo = NULL;
     adapt->PutStill = NULL;
     adapt->GetVideo = NULL;
     adapt->GetStill = NULL;
-    adapt->StopVideo = TDFXStopVideo;
-    adapt->SetPortAttribute = TDFXSetPortAttribute;
-    adapt->GetPortAttribute = TDFXGetPortAttribute;
+    adapt->StopVideo = TDFXStopVideoTexture;
+    adapt->SetPortAttribute = TDFXSetPortAttributeTexture;
+    adapt->GetPortAttribute = TDFXGetPortAttributeTexture;
     adapt->QueryBestSize = TDFXQueryBestSize;
-    adapt->PutImage = TDFXPutImage;
-    /*adapt->PutImage = TDFXPutImageOverlay;    */
+    adapt->PutImage = TDFXPutImageTexture;
     adapt->QueryImageAttributes = TDFXQueryImageAttributes;
 
+    pTDFX->textureAdaptor = adapt;
+
     return adapt;
 }
 
 
-static void 
-TDFXStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
-{
-  if (cleanup)
-  {
-    /* Deallocate the offscreen temporary buffer. */
-    TDFXDeallocateOffscreenBuffer (pScrn, 0);
-  }
+/*
+ * MISCELLANEOUS ROUTINES
+ */
+
+
+static int
+TDFXQueryImageAttributes(
+    ScrnInfoPtr pScrn,
+    int id,
+    unsigned short *w, unsigned short *h,
+    int *pitches, int *offsets
+){
+    int size, tmp;
+
+    if(*w > 1024) *w = 1024;
+    if(*h > 1024) *h = 1024;
+
+    *w = (*w + 1) & ~1;
+    if(offsets) offsets[0] = 0;
+
+    switch(id) {
+    case FOURCC_YV12:
+    case FOURCC_I420:
+        *h = (*h + 1) & ~1;
+        size = (*w + 3) & ~3;
+        if(pitches) pitches[0] = size;
+        size *= *h;
+        if(offsets) offsets[1] = size;
+        tmp = ((*w >> 1) + 3) & ~3;
+        if(pitches) pitches[1] = pitches[2] = tmp;
+        tmp *= (*h >> 1);
+        size += tmp;
+        if(offsets) offsets[2] = size;
+        size += tmp;
+        break;
+    case FOURCC_UYVY:
+    case FOURCC_YUY2:
+    default:
+        size = *w << 1;
+        if(pitches) pitches[0] = size;
+        size *= *h;
+        break;
+    }
+
+    return size;
 }
 
 
-static int 
-TDFXSetPortAttribute (ScrnInfoPtr pScrn, 
-		      Atom attribute,
-		      INT32 value, 
-		      pointer data) 
-{
-  return BadMatch;
+static int
+TDFXSetPortAttributeOverlay(
+  ScrnInfoPtr pScrn,
+  Atom attribute,
+  INT32 value,
+  pointer data
+){
+
+  TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
+  TDFXPtr pTDFX = TDFXPTR(pScrn);
+
+  if(attribute == xvColorKey) {
+        pPriv->colorKey = value;
+        pTDFX->writeLong(pTDFX, VIDCHROMAMIN, pPriv->colorKey);
+        pTDFX->writeLong(pTDFX, VIDCHROMAMAX, pPriv->colorKey);
+        REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+  } else if(attribute == xvFilterQuality) {
+        if((value < 0) || (value > 1))
+           return BadValue;
+        pPriv->filterQuality = value;
+  } else return BadMatch;
+
+  return Success;
+}
+
+static int
+TDFXGetPortAttributeOverlay(
+  ScrnInfoPtr pScrn,
+  Atom attribute,
+  INT32 *value,
+  pointer data
+){
+  TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
+
+  if(attribute == xvColorKey) {
+        *value = pPriv->colorKey;
+  } else if(attribute == xvFilterQuality) {
+        *value = pPriv->filterQuality;
+  } else return BadMatch;
+
+  return Success;
 }
 
 
 static int 
-TDFXGetPortAttribute(ScrnInfoPtr pScrn, 
-		     Atom attribute,
-		     INT32 *value, 
-		     pointer data)
-{
-  return BadMatch;
+TDFXSetPortAttributeTexture(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 value, 
+  pointer data
+) {
+  return Success;
 }
 
 
+static int 
+TDFXGetPortAttributeTexture(
+  ScrnInfoPtr pScrn, 
+  Atom attribute,
+  INT32 *value, 
+  pointer data
+){
+  return Success;
+}
 
-static void 
-TDFXQueryBestSize(ScrnInfoPtr pScrn, 
-		  Bool motion,
-		  short vid_w, short vid_h, 
-		  short drw_w, short drw_h, 
-		  unsigned int *p_w, unsigned int *p_h, 
-		  pointer data)
-{
-  /* No alignment restrictions */
+
+static void
+TDFXQueryBestSize(
+  ScrnInfoPtr pScrn,
+  Bool motion,
+  short vid_w, short vid_h,
+  short drw_w, short drw_h,
+  unsigned int *p_w, unsigned int *p_h,
+  pointer data
+){
+   if(vid_w > drw_w) drw_w = vid_w;
+   if(vid_h > drw_h) drw_h = vid_h;
+   
   *p_w = drw_w;
-  *p_h = drw_h; 
+  *p_h = drw_h;
 }
 
 
-
-/* This performs a screen to screen stretch blit.  All coordinates are
- * in screen memory.  This function assumes that the src and dst format 
- * registers have been setup already.  This function does not save 
- * the registers it trashes. */
 static void
-TDFXScreenToScreenYUVStretchBlit (ScrnInfoPtr pScrn,
-				  short src_x1, short src_y1,
-				  short src_x2, short src_y2,
-				  short dst_x1, short dst_y1,
-				  short dst_x2, short dst_y2)
-{
-   TDFXPtr pTDFX = TDFXPTR(pScrn);
+TDFXCopyData(
+  unsigned char *src,
+  unsigned char *dst,
+  int srcPitch,
+  int dstPitch,
+  int h,
+  int w
+){
+    while(h--) {
+        memcpy(dst, src, w);
+        src += srcPitch;
+        dst += dstPitch;
+    }
+}
 
-  /* reformulate the paramaters the way the hardware wants them */
-  INT32
-    src_x = src_x1 & 0x1FFF,
-    src_y = src_y1 & 0x1FFF,
-    dst_x = dst_x1 & 0x1FFF,
-    dst_y = dst_y1 & 0x1FFF,
-    src_w = (src_x2 - src_x) & 0x1FFF,
-    src_h = (src_y2 - src_y) & 0x1FFF,
-    dst_w = (dst_x2 - dst_x) & 0x1FFF,
-    dst_h = (dst_y2 - dst_y) & 0x1FFF;
-
-  /* Setup for blit src and dest */
-  TDFXMakeRoom(pTDFX, 5);
-  DECLARE(SSTCP_DSTSIZE|SSTCP_SRCSIZE|SSTCP_DSTXY|
-	  SSTCP_COMMAND|SSTCP_COMMANDEXTRA);
-  /* We want the blit to wait for vsync. */
-  TDFXWriteLong(pTDFX, SST_2D_COMMANDEXTRA, 4);
-  TDFXWriteLong(pTDFX, SST_2D_SRCSIZE, src_w | (src_h<<16));
-  TDFXWriteLong(pTDFX, SST_2D_DSTSIZE, dst_w | (dst_h<<16));
-  TDFXWriteLong(pTDFX, SST_2D_DSTXY,   dst_x | (dst_y<<16));
-  /* XXX find the ROP table and figure out why CC is the right choice. */
-  TDFXWriteLong(pTDFX, SST_2D_COMMAND, 
-		(0xCC<<24)|SST_2D_SCRNTOSCRNSTRETCH);
-  /* Write to the launch area to start the blit */
-  TDFXMakeRoom(pTDFX, 1);
-  DECLARE_LAUNCH (1, 0);
-  TDFXWriteLong(pTDFX, SST_2D_LAUNCH, src_x | (src_y<<16));
+static void
+TDFXCopyMungedData(
+   unsigned char *src1,
+   unsigned char *src2,
+   unsigned char *src3,
+   unsigned char *dst1,
+   int srcPitch,
+   int srcPitch2,
+   int dstPitch,
+   int h,
+   int w
+){
+   CARD32 *dst;
+   CARD8 *s1, *s2, *s3;
+   int i, j;
+
+   w >>= 1;
+
+   for(j = 0; j < h; j++) {
+        dst = (CARD32*)dst1;
+        s1 = src1;  s2 = src2;  s3 = src3;
+        i = w;
+        while(i > 4) {
+           dst[0] = s1[0] | (s1[1] << 16) | (s3[0] << 8) | (s2[0] << 24);
+           dst[1] = s1[2] | (s1[3] << 16) | (s3[1] << 8) | (s2[1] << 24);
+           dst[2] = s1[4] | (s1[5] << 16) | (s3[2] << 8) | (s2[2] << 24);
+           dst[3] = s1[6] | (s1[7] << 16) | (s3[3] << 8) | (s2[3] << 24);
+           dst += 4; s2 += 4; s3 += 4; s1 += 8;
+           i -= 4;
+        }
+        while(i--) {
+           dst[0] = s1[0] | (s1[1] << 16) | (s3[0] << 8) | (s2[0] << 24);
+           dst++; s2++; s3++;
+           s1 += 2;
+        }
+
+        dst1 += dstPitch;
+        src1 += srcPitch;
+        if(j & 1) {
+            src2 += srcPitch2;
+            src3 += srcPitch2;
+        }
+   }
 }
 
+
+/*
+ * TEXTURE DRAWING FUNCTIONS
+ */
+
+
 static void
-YUVPlanarToPacked (ScrnInfoPtr pScrn,
-		   short src_x, short src_y,
-		   short src_h, short src_w,
-		   int id, char *buf,
-		   short width, short height,
-		   FBAreaPtr fbarea)
+TDFXStopVideoTexture(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
 {
   TDFXPtr pTDFX = TDFXPTR(pScrn);
+  TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
 
-   INT32 y;
-   void *dst;
-   char *psrc = buf,
-     *pdst = 0;
-   int count = 0;
-
-  /* Register saves */
-   INT32
-     yuvBaseAddr,
-     yuvStride;
-
-  /* Save these registers so I can restore them when we are done. */
-  yuvBaseAddr = TDFXReadLongMMIO(pTDFX, YUVBASEADDR);
-  yuvStride =   TDFXReadLongMMIO(pTDFX, YUVSTRIDE);
-
-
-  dst = 0;
-
-  /* Set yuvBaseAddress register to point to the buffer. */
-  TDFXWriteLongMMIO (pTDFX, YUVBASEADDR, pTDFX->fbOffset + 
-		     pTDFX->stride * (fbarea->box.y1 + pScrn->virtualY) 
-		     + fbarea->box.x1);
-  /* Set yuvStride register to reflect stride of U and V planes */
-  /* There is a subtle issue involved with copying the Y plane.  Y is
-   * sampled at twice the rate of the U and V data, in both
-   * directions.  But when packing their needs to be two Y values for
-   * each U,V pair.  So if src_x is odd we will end up missing on
-   * of the Y values.  To correct for this we will always adjust the src
-   * x value.  This adjust is done both in computing the address of the
-   * pixels to copy and when determining the amount of pixels to copy.
-   * Note that care needs to be taken to insure that the offscreen
-   * temporary buffer is allocated with enough space to hold the possible
-   * extra column of data.
-   */
-  TDFXWriteLongMMIO (pTDFX, YUVSTRIDE, pTDFX->stride);
-  psrc = (char*)buf;
-
-  /* psrc points to the base of the Y plane, move out to src_x, src_y */
-  psrc += (src_x & ~0x1) + src_y * width;
-  pdst = (char *)pTDFX->MMIOBase[0] + YUV_Y_BASE;
-  for (y = 0; y < src_h; y++)
-  {   
-    memcpy (pdst, psrc, src_w + (src_x & 0x1));
-    psrc += width;
-    /* YUV planar region is always 1024 bytes wide */
-    pdst += 1024;
-  }
+  REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
 
-  /* The difference between FOURCC_YV12 and FOURCC_I420 is the order
-   * that the U and V planes appear in the buffer.  But at this point
-   * I just send the second buffer as V and the third buffer as U.
-   * Depending on the format, the packing will be different and we
-   * handle it in the the way we pick the source format for the blit
-   * later on. */
-
-  pdst = (char *)pTDFX->MMIOBase[0] + YUV_V_BASE;
-  psrc = (char*)buf + width * height;
-  /* psrc now points to the base of the V plane, move out to src_x/2,
-   * src_y/2 */
-  psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
-  for (y = 0; y < src_h >> 1; y++)
-  {
-    /* YUV planar region is always 1024 bytes wide */
-    memcpy (pdst, psrc, src_w >> 1);
-    psrc += width >> 1;
-    pdst += 1024;
-  }
-  pdst = (char *)pTDFX->MMIOBase[0] + YUV_U_BASE;
-  psrc = (char*)buf + width * height + (width >> 1) * (height >> 1);
-  /* psrc now points to the base of the U plane, move out to src_x/2,
-   * src_y/2 */
-  psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
-  for (y = 0; y < src_h >> 1; y++)
-  {
-    /* YUV planar region is always 1024 bytes wide */
-    memcpy (pdst, psrc, src_w >> 1);
-    psrc += width >> 1;
-    pdst += 1024;
+  if (cleanup) {
+     if(pTDFX->textureBuffer) {
+        xf86FreeOffscreenArea(pTDFX->textureBuffer);
+        pTDFX->textureBuffer = NULL;
+     }
   }
+}
 
-  /* Before restoring trashed registers we have to wait for the conversion
-   * to finish.  We aren't using the FIFO for this but the hardware can
-   * take a little extra time even after we finish all the writes.  If we
-   * restore the registers before it finishes it can store some of the YUV
-   * data to the wrong place.  One particular wrong place is often on top
-   * of the hardware cursor data.  So we wait for the status register
-   * to go idle. */
-  /* XXX Right now wait for the whole chip to go idle.  This is more than 
-   * is required.  Find out which subsystem is handles the YUV packing and
-   * wait only on that status bit. */
-  count = 0;
-  do
-  {
-    count++;
-  } while ((TDFXReadLongMMIO(pTDFX, 0) & SST_BUSY) && count < 1000);
-
-  /* Restore trashed registers */
-  TDFXWriteLongMMIO(pTDFX, YUVBASEADDR, yuvBaseAddr);
-  TDFXWriteLongMMIO(pTDFX, YUVSTRIDE, yuvStride);  
+
+static void
+TDFXScreenToScreenYUVStretchBlit (ScrnInfoPtr pScrn,
+                                  short src_x1, short src_y1,
+                                  short src_x2, short src_y2,
+                                  short dst_x1, short dst_y1,
+                                  short dst_x2, short dst_y2)
+{
+   TDFXPtr pTDFX = TDFXPTR(pScrn);
+   /* reformulate the paramaters the way the hardware wants them */
+   INT32 src_x = src_x1 & 0x1FFF;
+   INT32 src_y = src_y1 & 0x1FFF;
+   INT32 dst_x = dst_x1 & 0x1FFF;
+   INT32 dst_y = dst_y1 & 0x1FFF;
+   INT32 src_w = (src_x2 - src_x1) & 0x1FFF;
+   INT32 src_h = (src_y2 - src_y1) & 0x1FFF;
+   INT32 dst_w = (dst_x2 - dst_x1) & 0x1FFF;
+   INT32 dst_h = (dst_y2 - dst_y1) & 0x1FFF;
+   /* Setup for blit src and dest */
+   TDFXMakeRoom(pTDFX, 4);
+   DECLARE(SSTCP_DSTSIZE|SSTCP_SRCSIZE|SSTCP_DSTXY|SSTCP_COMMAND/*|SSTCP_COMMANDEXTRA*/);
+   /* TDFXWriteLong(pTDFX, SST_2D_COMMANDEXTRA, SST_COMMANDEXTRA_VSYNC);*/
+   TDFXWriteLong(pTDFX, SST_2D_SRCSIZE, src_w | (src_h<<16));
+   TDFXWriteLong(pTDFX, SST_2D_DSTSIZE, dst_w | (dst_h<<16));
+   TDFXWriteLong(pTDFX, SST_2D_DSTXY,   dst_x | (dst_y<<16));
+   TDFXWriteLong(pTDFX, SST_2D_COMMAND, SST_2D_SCRNTOSCRNSTRETCH | 0xCC000000);
+   /* Write to the launch area to start the blit */
+   TDFXMakeRoom(pTDFX, 1);
+   DECLARE_LAUNCH(1, 0);
+   TDFXWriteLong(pTDFX, SST_2D_LAUNCH, (src_x<<1) | (src_y<<16));
+   /* Wait for it to happen */
+   TDFXSendNOPFifo2D(pScrn);
 }
 
-static int 
-TDFXPutImage( 
-	     ScrnInfoPtr pScrn, 
-	     short src_x, short src_y, 
-	     short drw_x, short drw_y,
-	     short src_w, short src_h, 
-	     short drw_w, short drw_h,
-	     int id, unsigned char* buf, 
-	     short width, short height, 
-	     Bool sync,
-	     RegionPtr clipBoxes, pointer data
-	     )
+
+static void
+YUVPlanarToPacked (ScrnInfoPtr pScrn,
+                   short src_x, short src_y,
+                   short src_h, short src_w,
+                   int id, char *buf,
+                   short width, short height,
+                   FBAreaPtr fbarea)
 {
    TDFXPtr pTDFX = TDFXPTR(pScrn);
+   char *psrc, *pdst;
+   int count;
+   int baseaddr;
+   INT32 yuvBaseAddr, yuvStride;
+
+   /* Save these registers so I can restore them when we are done. */
+   yuvBaseAddr = TDFXReadLongMMIO(pTDFX, YUVBASEADDR);
+   yuvStride =   TDFXReadLongMMIO(pTDFX, YUVSTRIDE);
+
+   /* Set yuvBaseAddress and yuvStride. */
+   baseaddr = pTDFX->fbOffset + pTDFX->cpp * fbarea->box.x1 + pTDFX->stride * fbarea->box.y1;
+   TDFXWriteLongMMIO(pTDFX, YUVSTRIDE, pTDFX->stride);
+   TDFXWriteLongMMIO(pTDFX, YUVBASEADDR, baseaddr);
+
+   /* Copy Y plane (twice as much Y as U or V) */
+   psrc = (char *)buf;
+   psrc += (src_x & ~0x1) + src_y * width;
+   pdst = (char *)pTDFX->MMIOBase[0] + YUV_Y_BASE;
+   TDFXCopyData(psrc, pdst, width, 1024, src_h, src_w + (src_x & 0x1));
+
+   /* Copy V plane */
+   psrc = (char*)buf + width * height;
+   psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
+   pdst = (char *)pTDFX->MMIOBase[0] + YUV_V_BASE;
+   TDFXCopyData(psrc, pdst, width >> 1, 1024, src_h >> 1, src_w >> 1);
+
+   /* Copy U plane */
+   psrc = (char*)buf + width * height + (width >> 1) * (height >> 1);
+   psrc += (src_x >> 1) + (src_y >> 1) * (width >> 1);
+   pdst = (char *)pTDFX->MMIOBase[0] + YUV_U_BASE;
+   TDFXCopyData(psrc, pdst, width >> 1, 1024, src_h >> 1, src_w >> 1);
+
+   /* IDLE until the copy finished, timeout for safety */
+   for (count = 0; count < 1000; count++) 
+     if (!((TDFXReadLongMMIO(pTDFX, STATUS) & SST_BUSY)))
+       break;
+
+   /* Restore trashed registers */
+   TDFXWriteLongMMIO(pTDFX, YUVBASEADDR, yuvBaseAddr);
+   TDFXWriteLongMMIO(pTDFX, YUVSTRIDE, yuvStride);  
+
+   /* Wait for it to happen */
+   TDFXSendNOPFifo2D(pScrn);
+}
+
 
+static int 
+TDFXPutImageTexture( 
+             ScrnInfoPtr pScrn, 
+             short src_x, short src_y, 
+             short drw_x, short drw_y,
+             short src_w, short src_h, 
+             short drw_w, short drw_h,
+             int id, unsigned char* buf, 
+             short width, short height, 
+             Bool sync,
+             RegionPtr clipBoxes, pointer data
+             )
+{
+   TDFXPtr pTDFX = TDFXPTR(pScrn);
    BoxPtr pbox;
    int nbox;
+   int format;
+
+   /* Check the source format */
+   if (id == FOURCC_YV12)      format = SST_2D_FORMAT_YUYV;
+   else if (id == FOURCC_UYVY) format = SST_2D_FORMAT_UYVY;
+   else                        return BadAlloc;
+
+   /* Get a buffer to store the packed YUV data */
+   if (!(pTDFX->textureBuffer = TDFXAllocateMemoryArea(pScrn, pTDFX->textureBuffer, src_w, src_h)))
+        return BadAlloc;
+
+   /* Pack the YUV data in offscreen memory using YUV framebuffer (0x[CDE]0000) */
+   YUVPlanarToPacked (pScrn, src_x, src_y, src_h, src_w,
+                      id, (char *)buf, width, height,
+                      pTDFX->textureBuffer);
+
+   /* Setup source and destination pixel formats (yuv -> rgb) */
+   TDFXMakeRoom(pTDFX, 2);
+   DECLARE(SSTCP_SRCFORMAT|SSTCP_DSTFORMAT);
+   TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, pTDFX->stride|((pTDFX->cpp+1)<<16));
+   TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, pTDFX->stride|((format)<<16));
+
+   /* Blit packed YUV data from offscreen memory, respecting clips */
+#define SRC_X1 (pTDFX->textureBuffer->box.x1)
+#define SRC_Y1 (pTDFX->textureBuffer->box.y1)
+#define SCALEX(dx) ((int)(((dx) * src_w) / drw_w))
+#define SCALEY(dy) ((int)(((dy) * src_h) / drw_h))
+   for (nbox = REGION_NUM_RECTS(clipBoxes),
+        pbox = REGION_RECTS(clipBoxes); nbox > 0; nbox--, pbox++)
+   {
+     TDFXScreenToScreenYUVStretchBlit (pScrn,
+        SRC_X1 + SCALEX(pbox->x1 - drw_x), 
+        SRC_Y1 + SCALEY(pbox->y1 - drw_y),
+        SRC_X1 + SCALEX(pbox->x2 - drw_x), 
+        SRC_Y1 + SCALEY(pbox->y2 - drw_y),
+        pbox->x1, pbox->y1,
+        pbox->x2, pbox->y2);
+   }
 
-   FBAreaPtr fbarea;
+   /* Restore the WAX registers we trashed */
+   TDFXMakeRoom(pTDFX, 2);
+   DECLARE(SSTCP_SRCFORMAT|SSTCP_DSTFORMAT);
+   TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, pTDFX->sst2DDstFmtShadow);
+   TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, pTDFX->sst2DSrcFmtShadow);
 
-   /* Make sure we are synced up (this really means, lock and find the 
-    * fifo pointer. */
-   TDFXFirstSync (pScrn);
+   /* Wait for it to happen */
+   TDFXSendNOPFifo2D(pScrn);
 
-   /* Do the right thing for the given format */
-   switch (id)
-   {
-   case FOURCC_YV12:
-   case FOURCC_I420:
-     /* Get a buffer to use to store the packed YUV data */
-     fbarea = TDFXAllocateOffscreenBuffer (pScrn, id, src_w, src_h);
-    
-     if (!fbarea)
-     {
-       return Success;
-     }
+   return Success;
+}
 
-     YUVPlanarToPacked (pScrn, src_x, src_y, src_h, src_w,
-			id, (char *)buf, width, height,
-			fbarea);
-     /* Don't know what executed last so we need to send a NOP */
-     TDFXSendNOP(pScrn);   
-
-     /* Setup the dst and src format once, they don't change for all the
-      * blits. */
-     TDFXMakeRoom(pTDFX, 2);
-     DECLARE(SSTCP_SRCFORMAT|SSTCP_DSTFORMAT);
-     TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, 
-		   pTDFX->stride|((pTDFX->cpp+1)<<16));
-     if (id == FOURCC_YV12)
-     {
-       /* Packed format is YUYV */
-       TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, 
-		     pTDFX->stride|((SST_2D_FORMAT_YUYV)<<16));
-     }
-     else
-     {
-       /* Packed format is UYVY */
-       TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, 
-		     pTDFX->stride|((SST_2D_FORMAT_UYVY)<<16));
-     }
 
-     /* Traverse the clip boxes */
-     nbox = REGION_NUM_RECTS(clipBoxes);
-     pbox = REGION_RECTS(clipBoxes);
-     
-     while (nbox--)
-     {
-       /* The destination clip regions come with the clip boxes, but
-	* the src coordinates have to be computed because we are doing
-	* a stretch blit.  These macros perform that compuation, but
-	* they could use some work.  When testing with still images these
-	* computations caused some jitter in the resulting output, but
-	* with actual video playback I haven't noticed any problems. */
-#define SRC_X1 (fbarea->box.x1)
-#define SRC_Y1 (fbarea->box.y1 + pScrn->virtualY)
-#define SCALEX(dx) ((int)(((dx) * src_w + (drw_w>>1)) / drw_w))
-#define SCALEY(dy) ((int)(((dy) * src_h + (drw_h>>1)) / drw_h))
-       
-       /* Do the screen-to-screen blit clipped to the clip boxes. */
-       TDFXScreenToScreenYUVStretchBlit 
-	 (pScrn,
-	  SRC_X1 + SCALEX(pbox->x1 - drw_x), 
-	  SRC_Y1 + SCALEY(pbox->y1 - drw_y),
-	  SRC_X1 + SCALEX(pbox->x2 - drw_x), 
-	  SRC_Y1 + SCALEY(pbox->y2 - drw_y),
-	  /* these destination coordinates come
-	   * right from the clip box. */
-	  pbox->x1, pbox->y1,
-	  pbox->x2, pbox->y2);
-       pbox++;
-     }
+/*
+ * COMMON DRAWING FUNCTIONS
+ */
 
-     /* Restore the WAX registers we trashed */
-     TDFXMakeRoom(pTDFX, 2);
-     DECLARE(SSTCP_SRCFORMAT|SSTCP_DSTFORMAT);
-     TDFXWriteLong(pTDFX, SST_2D_DSTFORMAT, pTDFX->sst2DDstFmtShadow);
-     TDFXWriteLong(pTDFX, SST_2D_SRCFORMAT, pTDFX->sst2DSrcFmtShadow);
+static Bool
+RegionsEqual(RegionPtr A, RegionPtr B)
+{
+    int *dataA, *dataB;
+    int num;
+
+    num = REGION_NUM_RECTS(A);
+    if(num != REGION_NUM_RECTS(B))
+        return FALSE;
+
+    if((A->extents.x1 != B->extents.x1) ||
+       (A->extents.x2 != B->extents.x2) ||
+       (A->extents.y1 != B->extents.y1) ||
+       (A->extents.y2 != B->extents.y2))
+        return FALSE;
+
+    dataA = (int*)REGION_RECTS(A);
+    dataB = (int*)REGION_RECTS(B);
+
+    while(num--) {
+        if((dataA[0] != dataB[0]) || (dataA[1] != dataB[1]))
+           return FALSE;
+        dataA += 2;
+        dataB += 2;
+    }
 
-     /* The rest of the driver won't know what I have done so I do a stall to 
-      * make sure the next command sent will work. */
-     TDFXSendNOP(pScrn);  
-     break;
-   /* XXX What am I supposed to do about the sync flag? */
+    return TRUE;
+}
 
-   }
 
-   return Success;
+static Bool
+TDFXClipVideo(
+  BoxPtr dst,
+  INT32 *xa,
+  INT32 *xb,
+  INT32 *ya,
+  INT32 *yb,
+  RegionPtr reg,
+  INT32 width,
+  INT32 height
+){
+    INT32 vscale, hscale, delta;
+    BoxPtr extents = REGION_EXTENTS(DummyScreen, reg);
+    int diff;
+
+    hscale = ((*xb - *xa) << 16) / (dst->x2 - dst->x1);
+    vscale = ((*yb - *ya) << 16) / (dst->y2 - dst->y1);
+
+    *xa <<= 16; *xb <<= 16;
+    *ya <<= 16; *yb <<= 16;
+
+    diff = extents->x1 - dst->x1;
+    if(diff > 0) {
+        dst->x1 = extents->x1;
+        *xa += diff * hscale;
+    }
+    diff = dst->x2 - extents->x2;
+    if(diff > 0) {
+        dst->x2 = extents->x2;
+        *xb -= diff * hscale;
+    }
+    diff = extents->y1 - dst->y1;
+    if(diff > 0) {
+        dst->y1 = extents->y1;
+        *ya += diff * vscale;
+    }
+    diff = dst->y2 - extents->y2;
+    if(diff > 0) {
+        dst->y2 = extents->y2;
+        *yb -= diff * vscale;
+    }
+
+    if(*xa < 0) {
+        diff =  (- *xa + hscale - 1)/ hscale;
+        dst->x1 += diff;
+        *xa += diff * hscale;
+    }
+    delta = *xb - (width << 16);
+    if(delta > 0) {
+        diff = (delta + hscale - 1)/ hscale;
+        dst->x2 -= diff;
+        *xb -= diff * hscale;
+    }
+    if(*xa >= *xb) return FALSE;
+
+    if(*ya < 0) {
+        diff =  (- *ya + vscale - 1)/ vscale;
+        dst->y1 += diff;
+        *ya += diff * vscale;
+    }
+    delta = *yb - (height << 16);
+    if(delta > 0) {
+        diff = (delta + vscale - 1)/ vscale;
+        dst->y2 -= diff;
+        *yb -= diff * vscale;
+    }
+    if(*ya >= *yb) return FALSE;
+
+    if((dst->x1 != extents->x1) || (dst->x2 != extents->x2) ||
+       (dst->y1 != extents->y1) || (dst->y2 != extents->y2))
+    {
+        RegionRec clipReg;
+        REGION_INIT(DummyScreen, &clipReg, dst, 1);
+        REGION_INTERSECT(DummyScreen, reg, reg, &clipReg);
+        REGION_UNINIT(DummyScreen, &clipReg);
+    }
+    return TRUE;
 }
 
-/* This code doesn't work yet.  Eventually this should use the video overlay
- * instead of the YUV-stretch-blit.  The overlay is better because it uses
- * bilinear filtering when scaling. */
-#if 0
-static int 
-TDFXPutImageOverlay( 
-	     ScrnInfoPtr pScrn, 
-	     short src_x, short src_y, 
-	     short drw_x, short drw_y,
-	     short src_w, short src_h, 
-	     short drw_w, short drw_h,
-	     int id, unsigned char* buf, 
-	     short width, short height, 
-	     Bool sync,
-	     RegionPtr clipBoxes, pointer data
-	     )
-{
-   TDFXPtr pTDFX = TDFXPTR(pScrn);
 
-   BoxPtr pbox;
-   int nbox;
+/*
+ * OVERLAY DRAWING FUNCTIONS
+ */
 
-   /* Computed Register values */
-   INT32 
-     vidInFormat;
 
-   static FBAreaPtr fbarea;
+static void
+TDFXResetVideoOverlay(ScrnInfoPtr pScrn)
+{
+    TDFXPtr pTDFX = TDFXPTR(pScrn);
+    TDFXPortPrivPtr pPriv = pTDFX->overlayAdaptor->pPortPrivates[0].ptr;
+
+    /* reset the video */
+    pTDFX->ModeReg.vidcfg &= ~VIDPROCCFGMASK;
+    pTDFX->writeLong(pTDFX, VIDPROCCFG, pTDFX->ModeReg.vidcfg);
+    pTDFX->writeLong(pTDFX, RGBMAXDELTA, 0x0080808);
+    pTDFX->writeLong(pTDFX, VIDCHROMAMIN, pPriv->colorKey);
+    pTDFX->writeLong(pTDFX, VIDCHROMAMAX, pPriv->colorKey);
+}
 
-   /* Do the right thing for the given format */
-   switch (id)
-   {
-   case FOURCC_YV12:
-   case FOURCC_I420:
 
-   
-     /* Get a buffer to use to store the packed YUV data */
-     fbarea = TDFXAllocateOffscreenBuffer (pScrn, id, src_w, src_h);
-    
-     if (!fbarea)
-       return Success;
-
-     YUVPlanarToPacked (pScrn,
-			src_x, src_y, src_h, src_w,
-			id, buf, width, height,
-			fbarea);
-
-     /* Setup the overlay */
-     TDFXWriteLongMMIO(pTDFX, VIDOVERLAYSTARTCOORDS,
-		       (drw_x&0x7FF) | ((drw_y & 0x7FF) << 12)
-		       /* XXX Lower 2 bits of X and Y? */);
-     TDFXWriteLongMMIO(pTDFX, VIDOVERLAYENDSCREENCOORDS,
-		       ((drw_x+drw_w)&0x7FF) | (((drw_y+drw_h)&0x7FF) << 12));
-
-     /* Set the Video in format */
-     vidInFormat = 0;
-     /* These magic numbers come from the spec on page 151 */
-     if (id == FOURCC_YV12)
-     {
-       /* Packed format is YUYV */
-       vidInFormat = 0x9 << 1;
-     }
-     else
-     {
-       /* Packed format is UYVY */
-       vidInFormat = 0xA << 1;       
-     }
+static void
+TDFXStopVideoOverlay(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+{
+  TDFXPtr pTDFX = TDFXPTR(pScrn);
+  TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
 
-     TDFXWriteLongMMIO (pTDFX, VIDINFORMAT, vidInFormat);
-     TDFXWriteLongMMIO (pTDFX, VIDINSTRIDE, src_w);
+  REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
 
-     /* Use magenta as the chroma color */
-     if (pTDFX->cpp == 2)
-     {
-       TDFXWriteLongMMIO(pTDFX, VIDCHROMAMIN,
-			 0x0000F71F);
-       TDFXWriteLongMMIO(pTDFX, VIDCHROMAMAX,
-			 0x0000F71F);
+  if(cleanup) {
+     if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
+        pTDFX->ModeReg.vidcfg &= ~VIDPROCCFGMASK;
+        pTDFX->writeLong(pTDFX, VIDPROCCFG, pTDFX->ModeReg.vidcfg);
      }
-     else /* (pTDFX->cpp == 3) */
-     {
-       TDFXWriteLongMMIO(pTDFX, VIDCHROMAMIN,
-			 0x00FF00FF);
-       TDFXWriteLongMMIO(pTDFX, VIDCHROMAMAX,
-			 0x00FF00FF);
+     if(pTDFX->overlayBuffer) {
+        xf86FreeOffscreenLinear(pTDFX->overlayBuffer);
+        pTDFX->overlayBuffer = NULL;
      }
-       
-     /* Set the src address */
-     TDFXWriteLongMMIO (pTDFX, VIDINADDR0, 
-		    pTDFX->fbOffset 
-		    + pTDFX->stride * (fbarea->box.y1 + pScrn->virtualY) 
-		    + fbarea->box.x1);
-     
-     /* Traverse the clip boxes */
-     nbox = REGION_NUM_RECTS(clipBoxes);
-     pbox = REGION_RECTS(clipBoxes);
-     
-     while (nbox--)
-     {
-       pbox++;
+     pPriv->videoStatus = 0;
+  } else {
+     if(pPriv->videoStatus & CLIENT_VIDEO_ON) {
+        pPriv->videoStatus |= OFF_TIMER;
+        pPriv->offTime = currentTime.milliseconds + OFF_DELAY;
      }
-     break;
+  }
+}
+
+
+static void
+TDFXDisplayVideoOverlay(
+    ScrnInfoPtr pScrn,
+    int id,
+    int offset,
+    short width, short height,
+    int pitch,
+    int left, int right, int top,
+    BoxPtr dstBox,
+    short src_w, short src_h,
+    short drw_w, short drw_h
+){
+    TDFXPtr pTDFX = TDFXPTR(pScrn);
+    TDFXPortPrivPtr pPriv = pTDFX->overlayAdaptor->pPortPrivates[0].ptr;
+    int dudx, dvdy;
+
+    dudx = (src_w << 20) / drw_w;
+    dvdy = (src_h << 20) / drw_h;
+
+    offset += ((left >> 16) & ~1) << 1;
+    left = (left & 0x0001ffff) << 3;
+
+    pTDFX->ModeReg.vidcfg &= ~VIDPROCCFGMASK;
+    pTDFX->ModeReg.vidcfg |= 0x00000320;
+
+    if(drw_w != src_w)       pTDFX->ModeReg.vidcfg |= (1 << 14);
+    if(drw_h != src_h)       pTDFX->ModeReg.vidcfg |= (1 << 15);
+    if(id == FOURCC_UYVY)    pTDFX->ModeReg.vidcfg |= (6 << 21);
+    else                     pTDFX->ModeReg.vidcfg |= (5 << 21);
+    if(pScrn->depth == 8)    pTDFX->ModeReg.vidcfg |= (1 << 11);
+    if(pPriv->filterQuality) pTDFX->ModeReg.vidcfg |= (3 << 16);
+    pTDFX->writeLong(pTDFX, VIDPROCCFG, pTDFX->ModeReg.vidcfg);
+
+    pTDFX->writeLong(pTDFX, VIDOVERLAYSTARTCOORDS, dstBox->x1 | (dstBox->y1 << 12));
+    pTDFX->writeLong(pTDFX, VIDOVERLAYENDSCREENCOORDS, (dstBox->x2 - 1) | ((dstBox->y2 - 1) << 12));
+    pTDFX->writeLong(pTDFX, VIDOVERLAYDUDX, dudx);
+    pTDFX->writeLong(pTDFX, VIDOVERLAYDUDXOFFSETSRCWIDTH, left | (src_w << 20));
+    pTDFX->writeLong(pTDFX, VIDOVERLAYDVDY, dvdy);
+    pTDFX->writeLong(pTDFX, VIDOVERLAYDVDYOFFSET, (top & 0x0000ffff) << 3);
+
+    pTDFX->ModeReg.stride &= 0x0000ffff;
+    pTDFX->ModeReg.stride |= pitch << 16;
+    pTDFX->writeLong(pTDFX, VIDDESKTOPOVERLAYSTRIDE, pTDFX->ModeReg.stride);
+    pTDFX->writeLong(pTDFX, SST_3D_LEFTOVERLAYBUF, offset & ~3);
+    pTDFX->writeLong(pTDFX, VIDINADDR0, offset & ~3);
+}
+
+
+static int
+TDFXPutImageOverlay(
+  ScrnInfoPtr pScrn,
+  short src_x, short src_y,
+  short drw_x, short drw_y,
+  short src_w, short src_h,
+  short drw_w, short drw_h,
+  int id, unsigned char* buf,
+  short width, short height,
+  Bool Sync,
+  RegionPtr clipBoxes, pointer data
+){
+   TDFXPtr pTDFX = TDFXPTR(pScrn);
+   TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
+   INT32 xa, xb, ya, yb;
+   unsigned char *dst_start;
+   int pitch, new_size, offset;
+   int s2offset = 0, s3offset = 0;
+   int srcPitch = 0, srcPitch2 = 0;
+   int dstPitch;
+   int top, left, npixels, nlines, bpp;
+   BoxRec dstBox;
+   CARD32 tmp;
+
+   /*
+    * s2offset, s3offset - byte offsets into U and V plane of the
+    *                      source where copying starts.  Y plane is
+    *                      done by editing "buf".
+    *
+    * offset - byte offset to the first line of the destination.
+    *
+    * dst_start - byte address to the first displayed pel.
+    *
+    */
+
+   if(src_w > drw_w) drw_w = src_w;
+   if(src_h > drw_h) drw_h = src_h;
+
+   /* Clip */
+   xa = src_x;
+   xb = src_x + src_w;
+   ya = src_y;
+   yb = src_y + src_h;
+
+   dstBox.x1 = drw_x;
+   dstBox.x2 = drw_x + drw_w;
+   dstBox.y1 = drw_y;
+   dstBox.y2 = drw_y + drw_h;
+
+   if(!TDFXClipVideo(&dstBox, &xa, &xb, &ya, &yb, clipBoxes, width, height))
+        return Success;
+
+   dstBox.x1 -= pScrn->frameX0;
+   dstBox.x2 -= pScrn->frameX0;
+   dstBox.y1 -= pScrn->frameY0;
+   dstBox.y2 -= pScrn->frameY0;
+
+   bpp = pScrn->bitsPerPixel >> 3;
+   pitch = bpp * pScrn->displayWidth;
+
+   switch(id) {
+   case FOURCC_YV12:
+   case FOURCC_I420:
+        dstPitch = ((width << 1) + 3) & ~3;
+        new_size = ((dstPitch * height) + bpp - 1) / bpp;
+        srcPitch = (width + 3) & ~3;
+        s2offset = srcPitch * height;
+        srcPitch2 = ((width >> 1) + 3) & ~3;
+        s3offset = (srcPitch2 * (height >> 1)) + s2offset;
+        break;
+   case FOURCC_UYVY:
+   case FOURCC_YUY2:
+   default:
+        dstPitch = ((width << 1) + 3) & ~3;
+        new_size = ((dstPitch * height) + bpp - 1) / bpp;
+        srcPitch = (width << 1);
+        break;
    }
-   return Success;
+
+   if(!(pTDFX->overlayBuffer = TDFXAllocateMemoryLinear(pScrn, pTDFX->overlayBuffer, new_size)))
+        return BadAlloc;
+
+   /* copy data */
+   top = ya >> 16;
+   left = (xa >> 16) & ~1;
+   npixels = ((((xb + 0xffff) >> 16) + 1) & ~1) - left;
+
+   offset = (pTDFX->overlayBuffer->offset * bpp) + (top * dstPitch) + pTDFX->fbOffset;
+   dst_start = pTDFX->FbBase + offset;
+
+   switch(id) {
+    case FOURCC_YV12:
+    case FOURCC_I420:
+        top &= ~1;
+        dst_start += left << 1;
+        tmp = ((top >> 1) * srcPitch2) + (left >> 1);
+        s2offset += tmp;
+        s3offset += tmp;
+        if(id == FOURCC_I420) {
+           tmp = s2offset;
+           s2offset = s3offset;
+           s3offset = tmp;
+        }
+        nlines = ((((yb + 0xffff) >> 16) + 1) & ~1) - top;
+        TDFXCopyMungedData(buf + (top * srcPitch) + left, buf + s2offset,
+                           buf + s3offset, dst_start, srcPitch, srcPitch2,
+                           dstPitch, nlines, npixels);
+        break;
+    case FOURCC_UYVY:
+    case FOURCC_YUY2:
+    default:
+        left <<= 1;
+        buf += (top * srcPitch) + left;
+        nlines = ((yb + 0xffff) >> 16) - top;
+        dst_start += left;
+        TDFXCopyData(buf, dst_start, srcPitch, dstPitch, nlines, npixels << 1);
+        break;
+    }
+
+    if(!RegionsEqual(&pPriv->clip, clipBoxes)) {
+        REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
+        (*pTDFX->AccelInfoRec->FillSolidRects)(pScrn, pPriv->colorKey, 
+                                               GXcopy, ~0,
+                                               REGION_NUM_RECTS(clipBoxes),
+                                               REGION_RECTS(clipBoxes));
+    }
+
+    TDFXDisplayVideoOverlay(pScrn, id, offset, width, height, dstPitch, xa, xb, ya, &dstBox, src_w, src_h, drw_w, drw_h);
+
+    pPriv->videoStatus = CLIENT_VIDEO_ON;
+
+    pTDFX->VideoTimerCallback = TDFXVideoTimerCallback;
+
+    return Success;
 }
 
-#endif
 
 static void
-TDFXDeallocateOffscreenBuffer (ScrnInfoPtr pScrn, int id)
+TDFXVideoTimerCallback(ScrnInfoPtr pScrn, Time time)
 {
-  TDFXPtr pTDFX = TDFXPTR(pScrn);
-  
-  /* There is only one buffer so just deallocate it */
-  if (pTDFX->offscreenYUVBuf)
-    xf86FreeOffscreenArea (pTDFX->offscreenYUVBuf);
+    TDFXPtr pTDFX = TDFXPTR(pScrn);
+    TDFXPortPrivPtr pPriv = pTDFX->overlayAdaptor->pPortPrivates[0].ptr;
+
+    if(pPriv->videoStatus & TIMER_MASK) {
+        if(pPriv->videoStatus & OFF_TIMER) {
+            if(pPriv->offTime < time) {
+                pTDFX->ModeReg.vidcfg &= ~VIDPROCCFGMASK;
+                pTDFX->writeLong(pTDFX, VIDPROCCFG, pTDFX->ModeReg.vidcfg);
+                pPriv->videoStatus = FREE_TIMER;
+                pPriv->freeTime = time + FREE_DELAY;
+            }
+        } else
+        if(pPriv->videoStatus & FREE_TIMER) {
+            if(pPriv->freeTime < time) {
+                if(pTDFX->overlayBuffer) {
+                   xf86FreeOffscreenLinear(pTDFX->overlayBuffer);
+                   pTDFX->overlayBuffer = NULL;
+                }
+                pPriv->videoStatus = 0;
+                pTDFX->VideoTimerCallback = NULL;
+            }
+        }
+    } else  /* shouldn't get here */
+        pTDFX->VideoTimerCallback = NULL;
 }
 
+
+/*
+ * MEMORY MANAGEMENT
+ */
+
+
 static FBAreaPtr
-TDFXAllocateOffscreenBuffer (ScrnInfoPtr pScrn, int id, int width, int height)
+TDFXAllocateMemoryArea (ScrnInfoPtr pScrn, FBAreaPtr area, int width, int height)
 {
-  int myWidth;
   TDFXPtr pTDFX = TDFXPTR(pScrn);
+  ScreenPtr pScreen;
+  FBAreaPtr new_area;
 
-  if (!pTDFX)
-    return NULL;
-
-  /* We tweak the width slightly */
-  myWidth = width;
-  /* We tweak the width slightly */
-  myWidth = width;
-
-  /* width is measured in pixels.  The pixels in the YUV image are alway
-   * 8 bit YUV data.  But, the xf86 offscreen manager allocates in terms of
-   * desktop pixels, so we adjust. */
-  myWidth = myWidth / pTDFX->cpp;
-  if (width % pTDFX->cpp)
-    myWidth++;
-
-  /* If we are putting up a subimage then we need an extra column of data
-   * if the source width is odd, instead of checkin the width just always
-   * allocate an extra column. */
-  /* XXX is this really necessary? */
-  myWidth++;
-
-  if (pTDFX->offscreenYUVBuf != NULL &&
-      myWidth == pTDFX->offscreenYUVBufWidth &&
-      height == pTDFX->offscreenYUVBufHeight)
-  {
-    /* we already have a buffer, don't do anything. */
-    return pTDFX->offscreenYUVBuf;
-  }   
-  
-  /* We have a buffer, but its not the right size so resize it */
-  if (pTDFX->offscreenYUVBuf != NULL)
-  {
-    if (!xf86ResizeOffscreenArea (pTDFX->offscreenYUVBuf, 
-				  myWidth,
-				  height))
-    {
-      return (NULL);
-    }
+  if (area) {
+    if ((area->box.x2 - area->box.x1 >= width) &&
+        (area->box.y2 - area->box.y1 >= height))
+      return area;
+
+    if (xf86ResizeOffscreenArea(area, width, height))
+      return area;
+
+    xf86FreeOffscreenArea(area);
   }
-  else
-  {
-    /* Allocate a brand new buffer */
-    pTDFX->offscreenYUVBuf = 
-      xf86AllocateOffscreenArea (pScrn->pScreen, 
-				 myWidth,
-				 height, 
-				 0,
-				 NULL, NULL, NULL);    
+
+  pScreen = screenInfo.screens[pScrn->scrnIndex];
+
+  new_area = xf86AllocateOffscreenArea(pScreen, width, height, pTDFX->cpp, NULL, NULL, NULL);
+
+  if (!new_area) {
+    int max_width, max_height;
+
+    xf86QueryLargestOffscreenArea(pScreen, &max_width, &max_height, pTDFX->cpp, 0, PRIORITY_EXTREME);
+
+    if (max_width < width || max_height < height)
+      return NULL;
+
+    xf86PurgeUnlockedOffscreenAreas(pScreen);
+    new_area = xf86AllocateOffscreenArea(pScreen, width, height, pTDFX->cpp, NULL, NULL, NULL);
   }
 
-  /* Return the buffer */
-  pTDFX->offscreenYUVBufWidth = myWidth;
-  pTDFX->offscreenYUVBufHeight = height; 
-  return (pTDFX->offscreenYUVBuf);
+  return new_area;
 }
 
 
-static int 
-TDFXQueryImageAttributes(
-    ScrnInfoPtr pScrn, 
-    int id, 
-    unsigned short *w, unsigned short *h, 
-    int *pitches, int *offsets)
+static FBLinearPtr
+TDFXAllocateMemoryLinear (ScrnInfoPtr pScrn, FBLinearPtr linear, int size)
 {
+   ScreenPtr pScreen;
+   FBLinearPtr new_linear;
 
-    int size;
-    TDFXPtr pTDFX = TDFXPTR(pScrn);
+   if(linear) {
+        if(linear->size >= size)
+           return linear;
 
-    /* The Maximum size for 3dfx YUV planar space 
-     * but our temporary buffer has to fit in the pixmap region which
-     * is the same width as the desktop and pTDFX->pixmapCacheLines 
-     * pixels high.
-     */
-    if(*w > 1024) *w = 1024;
-    if (*w > pTDFX->stride) *w = pTDFX->stride;
-    if(*h > pTDFX->pixmapCacheLines) *h = pTDFX->pixmapCacheLines;
+        if(xf86ResizeOffscreenLinear(linear, size))
+           return linear;
 
+        xf86FreeOffscreenLinear(linear);
+   }
 
+   pScreen = screenInfo.screens[pScrn->scrnIndex];
 
-    if (offsets) offsets[0] = 0;    
-    switch(id) {
-    case FOURCC_YV12:
-    case FOURCC_I420:
-	if (pitches) pitches[0] = *w;
-	/* Size of Y plane plus the size of U and V planes */
-	size = *w * *h;
-	if (offsets) offsets[1] = size;
-	size += ((*w >> 1) * (*h >> 1));
-	if (offsets) offsets[2] = size;
-	size += ((*w >> 1) * (*h >> 1));
-	break;
-    case FOURCC_UYVY:
-    case FOURCC_YUY2:
-    default:
-	size = *w << 1;
-	if(pitches) pitches[0] = size;
-	size *= *h;
-	break;
-    }
-    return size;
+   new_linear = xf86AllocateOffscreenLinear(pScreen, size, 4, NULL, NULL, NULL);
+
+   if(!new_linear) {
+        int max_size;
+
+        xf86QueryLargestOffscreenLinear(pScreen, &max_size, 4, PRIORITY_EXTREME);
+
+        if(max_size < size)
+           return NULL;
+
+        xf86PurgeUnlockedOffscreenAreas(pScreen);
+        new_linear = xf86AllocateOffscreenLinear(pScreen, size, 4, NULL, NULL, NULL);
+   }
+
+   return new_linear;
 }
 
 #endif  /* !XvExtension */
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
index c77566b78..a925b22ca 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.9 2000/12/15 15:19:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.8 2000/12/01 14:29:00 dawes Exp $ */
 /*
    Voodoo Banshee driver version 1.0.1
 
@@ -47,8 +47,10 @@
 #define SST_DESKTOP_CLUT_BYPASS         BIT(10)
 #define SST_HALF_MODE                   BIT(4)
 #define SST_CURSOR_EN                   BIT(27)
+#define SST_FBI_BUSY                    BIT(7)
 #define SST_BUSY                        BIT(9)
 #define SST_RETRACE			BIT(6)
+#define SST_COMMANDEXTRA_VSYNC          BIT(2)
 
 #define MEM_TYPE_SGRAM  0
 #define MEM_TYPE_SDRAM  1
@@ -198,9 +200,11 @@
 #define SST_3D_COMMAND 			SST_3D_OFFSET+0x120
 #define SST_3D_SLICTRL 			SST_3D_OFFSET+0x20C
 #define SST_3D_AACTRL			SST_3D_OFFSET+0x210
-#define SST_3D_CHIPMASK			SST_3D_OFFSET+0x214
+#define SST_3D_LEFTOVERLAYBUF		SST_3D_OFFSET+0x250
+#define SST_3D_RIGHTOVERLAYBUF		SST_3D_OFFSET+0x254
 
 /* NAPALM REGISTERS */
+#define CFG_PCI_COMMAND			4
 #define CFG_MEM0BASE			16
 #define CFG_MEM1BASE			20
 #define CFG_INIT_ENABLE        		64
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
index 54afeb68e..a39b3cc51 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
@@ -43,13 +43,14 @@ else
 endif
 
 gamma-objs  := gamma_drv.o    gamma_dma.o
-tdfx-objs   := tdfx_drv.o     tdfx_drm.o
+tdfx-objs   := tdfx_drv.o                   tdfx_context.o
 r128-objs   := r128_drv.o     r128_cce.o    r128_context.o   r128_bufs.o \
                r128_state.o
 radeon-objs := radeon_drv.o   radeon_cp.o   radeon_context.o radeon_bufs.o \
                radeon_state.o
 ffb-objs    := ffb_drv.o                    ffb_context.o
-mga-objs    := mga_drv.o mga_drm.o mga_dma.o mga_state.o mga_warp.o
+mga-objs    := mga_drv.o      mga_dma.o     mga_context.o    mga_bufs.o \
+               mga_state.o
 i810-objs   := i810_drv.o     i810_dma.o    i810_context.o   i810_bufs.o
 
 obj-$(CONFIG_DRM_GAMMA)  += gamma.o
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux
index 9335b1847..b5aca0a89 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux
@@ -47,8 +47,6 @@
 
 # **** End of SMP/MODVERSIONS detection
 
-#MODS=           gamma.o tdfx.o r128.o radeon.o
-#LIBS=           libdrm.a
 MODS=           gamma.o tdfx.o
 LIBS=
 
@@ -137,9 +135,13 @@ ifeq ($(AGP),1)
 MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
 #DRMOBJS += agpsupport.o
 MODS += mga.o r128.o radeon.o
-#ifeq ($(MACHINE),i386)
+ifeq ($(MACHINE),i386)
 MODS += i810.o
-#endif
+endif
+ifeq ($(MACHINE),i686)
+MODS += i810.o
+endif
+
 
 MGAOBJS=	mga_drv.o mga_dma.o mga_state.o mga_warp.o
 MGAHEADERS=	mga.h mga_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
index a238f85cd..470eb0335 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h
@@ -181,7 +181,7 @@ typedef enum {
 	_DRM_STAT_DMA,		/* DMA */
 	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
 	_DRM_STAT_MISSED	/* Missed DMA opportunity */
-	
+
 				/* Add to the *END* of the list */
 } drm_stat_type_t;
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
index a238f85cd..470eb0335 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h
@@ -181,7 +181,7 @@ typedef enum {
 	_DRM_STAT_DMA,		/* DMA */
 	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
 	_DRM_STAT_MISSED	/* Missed DMA opportunity */
-	
+
 				/* Add to the *END* of the list */
 } drm_stat_type_t;