svn merge -r586:HEAD "^/branches/released" .

6 files changed, 4291 insertions, 4178 deletions

diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index 6c4dabc41..abcb96668 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -1,939 +1,1045 @@
-/*
- * Copyright © 2007, 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <errno.h>
-#include <xf86drm.h>
-#include "xf86Module.h"
-#include "scrnintstr.h"
-#include "windowstr.h"
-#include "dixstruct.h"
-#include "dri2.h"
-#include "xf86VGAarbiter.h"
-
-#include "xf86.h"
-
-CARD8 dri2_major; /* version of DRI2 supported by DDX */
-CARD8 dri2_minor;
-
-static int           dri2ScreenPrivateKeyIndex;
-static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKeyIndex;
-static RESTYPE       dri2DrawableRes;
-
-typedef struct _DRI2Screen *DRI2ScreenPtr;
-
-typedef struct _DRI2Drawable {
-    DRI2ScreenPtr        dri2_screen;
-    int			 width;
-    int			 height;
-    DRI2BufferPtr	*buffers;
-    int			 bufferCount;
-    unsigned int	 swapsPending;
-    ClientPtr		 blockedClient;
-    Bool		 blockedOnMsc;
-    int			 swap_interval;
-    CARD64		 swap_count;
-    int64_t		 target_sbc; /* -1 means no SBC wait outstanding */
-    CARD64		 last_swap_target; /* most recently queued swap target */
-    CARD64		 last_swap_msc; /* msc at completion of most recent swap */
-    CARD64		 last_swap_ust; /* ust at completion of most recent swap */
-    int			 swap_limit; /* for N-buffering */
-} DRI2DrawableRec, *DRI2DrawablePtr;
-
-typedef struct _DRI2Screen {
-    ScreenPtr			 screen;
-    unsigned int		 numDrivers;
-    const char			**driverNames;
-    const char			*deviceName;
-    int				 fd;
-    unsigned int		 lastSequence;
-
-    DRI2CreateBufferProcPtr	 CreateBuffer;
-    DRI2DestroyBufferProcPtr	 DestroyBuffer;
-    DRI2CopyRegionProcPtr	 CopyRegion;
-    DRI2ScheduleSwapProcPtr	 ScheduleSwap;
-    DRI2GetMSCProcPtr		 GetMSC;
-    DRI2ScheduleWaitMSCProcPtr	 ScheduleWaitMSC;
-
-    HandleExposuresProcPtr       HandleExposures;
-} DRI2ScreenRec;
-
-static DRI2ScreenPtr
-DRI2GetScreen(ScreenPtr pScreen)
-{
-    return dixLookupPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey);
-}
-
-static DRI2DrawablePtr
-DRI2GetDrawable(DrawablePtr pDraw)
-{
-    DRI2DrawablePtr pPriv;
-    int rc;
-
-    rc = dixLookupResourceByType((pointer *) &pPriv, pDraw->id,
-				 dri2DrawableRes, NULL, DixReadAccess);
-    if (rc != Success)
-	return NULL;
-
-    return pPriv;
-}
-
-int
-DRI2CreateDrawable(DrawablePtr pDraw)
-{
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv;
-    CARD64          ust;
-    int		    rc;
-
-    rc = dixLookupResourceByType((pointer *) &pPriv, pDraw->id,
-				 dri2DrawableRes, NULL, DixReadAccess);
-    if (rc == Success || rc != BadValue)
-	return rc;
-
-    pPriv = xalloc(sizeof *pPriv);
-    if (pPriv == NULL)
-	return BadAlloc;
-
-    pPriv->dri2_screen = ds;
-    pPriv->width = pDraw->width;
-    pPriv->height = pDraw->height;
-    pPriv->buffers = NULL;
-    pPriv->bufferCount = 0;
-    pPriv->swapsPending = 0;
-    pPriv->blockedClient = NULL;
-    pPriv->blockedOnMsc = FALSE;
-    pPriv->swap_count = 0;
-    pPriv->target_sbc = -1;
-    pPriv->swap_interval = 1;
-    /* Initialize last swap target from DDX if possible */
-    if (!ds->GetMSC || !(*ds->GetMSC)(pDraw, &ust, &pPriv->last_swap_target))
-	pPriv->last_swap_target = 0;
-
-    pPriv->swap_limit = 1; /* default to double buffering */
-    pPriv->last_swap_msc = 0;
-    pPriv->last_swap_ust = 0;
-
-    if (!AddResource(pDraw->id, dri2DrawableRes, pPriv))
-	return BadAlloc;
-
-    return Success;
-}
-
-static int DRI2DrawableGone(pointer p, XID id)
-{
-    DRI2DrawablePtr pPriv = p;
-    DRI2ScreenPtr   ds = pPriv->dri2_screen;
-    DrawablePtr     root;
-    int i;
-
-    root = &WindowTable[ds->screen->myNum]->drawable;
-    if (pPriv->buffers != NULL) {
-	for (i = 0; i < pPriv->bufferCount; i++)
-	    (*ds->DestroyBuffer)(root, pPriv->buffers[i]);
-
-	xfree(pPriv->buffers);
-    }
-
-    xfree(pPriv);
-
-    return Success;
-}
-
-static int
-find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
-{
-    int i;
-
-    if (pPriv->buffers == NULL) {
-	return -1;
-    }
-
-    for (i = 0; i < pPriv->bufferCount; i++) {
-	if ((pPriv->buffers[i] != NULL)
-	    && (pPriv->buffers[i]->attachment == attachment)) {
-	    return i;
-	}
-    }
-
-    return -1;
-}
-
-static Bool
-allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
-			 DRI2DrawablePtr pPriv,
-			 unsigned int attachment, unsigned int format,
-			 int dimensions_match, DRI2BufferPtr *buffer)
-{
-    int old_buf = find_attachment(pPriv, attachment);
-
-    if ((old_buf < 0)
-	|| !dimensions_match
-	|| (pPriv->buffers[old_buf]->format != format)) {
-	*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
-	return TRUE;
-
-    } else {
-	*buffer = pPriv->buffers[old_buf];
-	pPriv->buffers[old_buf] = NULL;
-	return FALSE;
-    }
-}
-
-static DRI2BufferPtr *
-do_get_buffers(DrawablePtr pDraw, int *width, int *height,
-	       unsigned int *attachments, int count, int *out_count,
-	       int has_format)
-{
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-    DRI2BufferPtr  *buffers;
-    int need_real_front = 0;
-    int need_fake_front = 0;
-    int have_fake_front = 0;
-    int front_format = 0;
-    int dimensions_match;
-    int buffers_changed = 0;
-    int i;
-
-    if (!pPriv) {
-	*width = pDraw->width;
-	*height = pDraw->height;
-	*out_count = 0;
-	return NULL;
-    }
-
-    dimensions_match = (pDraw->width == pPriv->width)
-	&& (pDraw->height == pPriv->height);
-
-    buffers = xalloc((count + 1) * sizeof(buffers[0]));
-
-    for (i = 0; i < count; i++) {
-	const unsigned attachment = *(attachments++);
-	const unsigned format = (has_format) ? *(attachments++) : 0;
-
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
-				     format, dimensions_match,
-				     &buffers[i]))
-		buffers_changed = 1;
-
-	/* If the drawable is a window and the front-buffer is requested,
-	 * silently add the fake front-buffer to the list of requested
-	 * attachments.  The counting logic in the loop accounts for the case
-	 * where the client requests both the fake and real front-buffer.
-	 */
-	if (attachment == DRI2BufferBackLeft) {
-	    need_real_front++;
-	    front_format = format;
-	}
-
-	if (attachment == DRI2BufferFrontLeft) {
-	    need_real_front--;
-	    front_format = format;
-
-	    if (pDraw->type == DRAWABLE_WINDOW) {
-		need_fake_front++;
-	    }
-	}
-
-	if (pDraw->type == DRAWABLE_WINDOW) {
-	    if (attachment == DRI2BufferFakeFrontLeft) {
-		need_fake_front--;
-		have_fake_front = 1;
-	    }
-	}
-    }
-
-    if (need_real_front > 0) {
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,
-				     front_format, dimensions_match,
-				     &buffers[i++]))
-	    buffers_changed = 1;
-    }
-
-    if (need_fake_front > 0) {
-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,
-				     front_format, dimensions_match,
-				     &buffers[i++]))
-	    buffers_changed = 1;
-
-	have_fake_front = 1;
-    }
-
-    *out_count = i;
-
-
-    if (pPriv->buffers != NULL) {
-	for (i = 0; i < pPriv->bufferCount; i++) {
-	    if (pPriv->buffers[i] != NULL) {
-		(*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);
-	    }
-	}
-
-	xfree(pPriv->buffers);
-    }
-
-    pPriv->buffers = buffers;
-    pPriv->bufferCount = *out_count;
-    pPriv->width = pDraw->width;
-    pPriv->height = pDraw->height;
-    *width = pPriv->width;
-    *height = pPriv->height;
-
-
-    /* If the client is getting a fake front-buffer, pre-fill it with the
-     * contents of the real front-buffer.  This ensures correct operation of
-     * applications that call glXWaitX before calling glDrawBuffer.
-     */
-    if (have_fake_front && buffers_changed) {
-	BoxRec box;
-	RegionRec region;
-
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pPriv->width;
-	box.y2 = pPriv->height;
-	REGION_INIT(pDraw->pScreen, &region, &box, 0);
-
-	DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
-		       DRI2BufferFrontLeft);
-    }
-
-    return pPriv->buffers;
-}
-
-DRI2BufferPtr *
-DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,
-	       unsigned int *attachments, int count, int *out_count)
-{
-    return do_get_buffers(pDraw, width, height, attachments, count,
-			  out_count, FALSE);
-}
-
-DRI2BufferPtr *
-DRI2GetBuffersWithFormat(DrawablePtr pDraw, int *width, int *height,
-			 unsigned int *attachments, int count, int *out_count)
-{
-    return do_get_buffers(pDraw, width, height, attachments, count,
-			  out_count, TRUE);
-}
-
-/*
- * In the direct rendered case, we throttle the clients that have more
- * than their share of outstanding swaps (and thus busy buffers) when a
- * new GetBuffers request is received.  In the AIGLX case, we allow the
- * client to get the new buffers, but throttle when the next GLX request
- * comes in (see __glXDRIcontextWait()).
- */
-Bool
-DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw)
-{
-    DRI2DrawablePtr pPriv;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return FALSE;
-
-    /* Throttle to swap limit */
-    if ((pPriv->swapsPending >= pPriv->swap_limit) &&
-	!pPriv->blockedClient) {
-	ResetCurrentRequest(client);
-	client->sequence--;
-	IgnoreClient(client);
-	pPriv->blockedClient = client;
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-__DRI2BlockClient(ClientPtr client, DRI2DrawablePtr pPriv)
-{
-    if (pPriv->blockedClient == NULL) {
-	IgnoreClient(client);
-	pPriv->blockedClient = client;
-    }
-}
-
-void
-DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
-{
-    DRI2DrawablePtr pPriv;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return;
-
-    __DRI2BlockClient(client, pPriv);
-    pPriv->blockedOnMsc = TRUE;
-}
-
-int
-DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
-	       unsigned int dest, unsigned int src)
-{
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv;
-    DRI2BufferPtr   pDestBuffer, pSrcBuffer;
-    int		    i;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return BadDrawable;
-
-    pDestBuffer = NULL;
-    pSrcBuffer = NULL;
-    for (i = 0; i < pPriv->bufferCount; i++)
-    {
-	if (pPriv->buffers[i]->attachment == dest)
-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-	if (pPriv->buffers[i]->attachment == src)
-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-    }
-    if (pSrcBuffer == NULL || pDestBuffer == NULL)
-	return BadValue;
-
-    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);
-
-    return Success;
-}
-
-/* Can this drawable be page flipped? */
-Bool
-DRI2CanFlip(DrawablePtr pDraw)
-{
-    ScreenPtr pScreen = pDraw->pScreen;
-    WindowPtr pWin, pRoot;
-    PixmapPtr pWinPixmap, pRootPixmap;
-
-    if (pDraw->type == DRAWABLE_PIXMAP)
-	return TRUE;
-
-    pRoot = WindowTable[pScreen->myNum];
-    pRootPixmap = pScreen->GetWindowPixmap(pRoot);
-
-    pWin = (WindowPtr) pDraw;
-    pWinPixmap = pScreen->GetWindowPixmap(pWin);
-    if (pRootPixmap != pWinPixmap)
-	return FALSE;
-    if (!REGION_EQUAL(pScreen, &pWin->clipList, &pRoot->winSize))
-	return FALSE;
-
-    return TRUE;
-}
-
-/* Can we do a pixmap exchange instead of a blit? */
-Bool
-DRI2CanExchange(DrawablePtr pDraw)
-{
-    return FALSE;
-}
-
-void
-DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,
-		    unsigned int tv_sec, unsigned int tv_usec)
-{
-    DRI2DrawablePtr pPriv;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return;
-
-    ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
-			 frame, pPriv->swap_count);
-
-    if (pPriv->blockedClient)
-	AttendClient(pPriv->blockedClient);
-
-    pPriv->blockedClient = NULL;
-    pPriv->blockedOnMsc = FALSE;
-}
-
-static void
-DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,
-	       unsigned int tv_sec, unsigned int tv_usec)
-{
-    ScreenPtr	    pScreen = pDraw->pScreen;
-    DRI2DrawablePtr pPriv;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
-    }
-
-    /*
-     * Swap completed.
-     * Wake the client iff:
-     *   - it was waiting on SBC
-     *   - was blocked due to GLX make current
-     *   - was blocked due to swap throttling
-     *   - is not blocked due to an MSC wait
-     */
-    if (pPriv->target_sbc != -1 &&
-	pPriv->target_sbc <= pPriv->swap_count) {
-	ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
-			     frame, pPriv->swap_count);
-	pPriv->target_sbc = -1;
-
-	AttendClient(pPriv->blockedClient);
-	pPriv->blockedClient = NULL;
-    } else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
-	if (pPriv->blockedClient) {
-	    AttendClient(pPriv->blockedClient);
-	    pPriv->blockedClient = NULL;
-	}
-    }
-}
-
-void
-DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
-		   unsigned int tv_sec, unsigned int tv_usec, int type,
-		   DRI2SwapEventPtr swap_complete, void *swap_data)
-{
-    ScreenPtr	    pScreen = pDraw->pScreen;
-    DRI2DrawablePtr pPriv;
-    CARD64          ust = 0;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
-    }
-
-    pPriv->swapsPending--;
-    pPriv->swap_count++;
-
-    ust = ((CARD64)tv_sec * 1000000) + tv_usec;
-    if (swap_complete)
-	swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);
-
-    pPriv->last_swap_msc = frame;
-    pPriv->last_swap_ust = ust;
-
-    DRI2WakeClient(client, pDraw, frame, tv_sec, tv_usec);
-}
-
-Bool
-DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
-{
-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
-
-    /* If we're currently waiting for a swap on this drawable, reset
-     * the request and suspend the client.  We only support one
-     * blocked client per drawable. */
-    if ((pPriv->swapsPending) &&
-	pPriv->blockedClient == NULL) {
-	ResetCurrentRequest(client);
-	client->sequence--;
-	__DRI2BlockClient(client, pPriv);
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
-int
-DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-		CARD64 divisor, CARD64 remainder, CARD64 *swap_target,
-		DRI2SwapEventPtr func, void *data)
-{
-    ScreenPtr       pScreen = pDraw->pScreen;
-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv;
-    DRI2BufferPtr   pDestBuffer = NULL, pSrcBuffer = NULL;
-    int             ret, i;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return BadDrawable;
-    }
-
-    for (i = 0; i < pPriv->bufferCount; i++) {
-	if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)
-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-	if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)
-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
-    }
-    if (pSrcBuffer == NULL || pDestBuffer == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: drawable has no back or front?\n", __func__);
-	return BadDrawable;
-    }
-
-    /* Old DDX or no swap interval, just blit */
-    if (!ds->ScheduleSwap || !pPriv->swap_interval) {
-	BoxRec box;
-	RegionRec region;
-
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pDraw->width;
-	box.y2 = pDraw->height;
-	REGION_INIT(pScreen, &region, &box, 0);
-
-	pPriv->swapsPending++;
-
-	(*ds->CopyRegion)(pDraw, &region, pDestBuffer, pSrcBuffer);
-	DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,
-			 func, data);
-	return Success;
-    }
-
-    /*
-     * In the simple glXSwapBuffers case, all params will be 0, and we just
-     * need to schedule a swap for the last swap target + the swap interval.
-     */
-    if (target_msc == 0 && divisor == 0 && remainder == 0) {
-	/*
-	 * Swap target for this swap is last swap target + swap interval since
-	 * we have to account for the current swap count, interval, and the
-	 * number of pending swaps.
-	 */
-	*swap_target = pPriv->last_swap_target + pPriv->swap_interval;
-    } else {
-	/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
-	*swap_target = target_msc;
-    }
-
-    pPriv->swapsPending++;
-    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
-			      swap_target, divisor, remainder, func, data);
-    if (!ret) {
-	pPriv->swapsPending--; /* didn't schedule */
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: driver failed to schedule swap\n", __func__);
-	return BadDrawable;
-    }
-
-    pPriv->last_swap_target = *swap_target;
-
-    /* According to spec, return expected swapbuffers count SBC after this swap
-     * will complete.
-     */
-    *swap_target = pPriv->swap_count + pPriv->swapsPending;
-
-    return Success;
-}
-
-void
-DRI2SwapInterval(DrawablePtr pDrawable, int interval)
-{
-    ScreenPtr       pScreen = pDrawable->pScreen;
-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
-
-    if (pPriv == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return;
-    }
-
-    /* fixme: check against arbitrary max? */
-    pPriv->swap_interval = interval;
-}
-
-int
-DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
-{
-    ScreenPtr pScreen = pDraw->pScreen;
-    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv;
-    Bool ret;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL) {
-        xf86DrvMsg(pScreen->myNum, X_ERROR,
-		   "[DRI2] %s: bad drawable\n", __func__);
-	return BadDrawable;
-    }
-
-    if (!ds->GetMSC) {
-	*ust = 0;
-	*msc = 0;
-	*sbc = pPriv->swap_count;
-	return Success;
-    }
-
-    /*
-     * Spec needs to be updated to include unmapped or redirected
-     * drawables
-     */
-
-    ret = (*ds->GetMSC)(pDraw, ust, msc);
-    if (!ret)
-	return BadDrawable;
-
-    *sbc = pPriv->swap_count;
-
-    return Success;
-}
-
-int
-DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-	    CARD64 divisor, CARD64 remainder)
-{
-    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
-    DRI2DrawablePtr pPriv;
-    Bool ret;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return BadDrawable;
-
-    /* Old DDX just completes immediately */
-    if (!ds->ScheduleWaitMSC) {
-	DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);
-
-	return Success;
-    }
-
-    ret = (*ds->ScheduleWaitMSC)(client, pDraw, target_msc, divisor, remainder);
-    if (!ret)
-	return BadDrawable;
-
-    return Success;
-}
-
-int
-DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc,
-	    CARD64 *ust, CARD64 *msc, CARD64 *sbc)
-{
-    DRI2DrawablePtr pPriv;
-
-    pPriv = DRI2GetDrawable(pDraw);
-    if (pPriv == NULL)
-	return BadDrawable;
-
-    /* target_sbc == 0 means to block until all pending swaps are
-     * finished. Recalculate target_sbc to get that behaviour.
-     */
-    if (target_sbc == 0)
-        target_sbc = pPriv->swap_count + pPriv->swapsPending;
-
-    /* If current swap count already >= target_sbc,
-     * return immediately with (ust, msc, sbc) triplet of
-     * most recent completed swap.
-     */
-    if (pPriv->swap_count >= target_sbc) {
-        *sbc = pPriv->swap_count;
-        *msc = pPriv->last_swap_msc;
-        *ust = pPriv->last_swap_ust;
-        return Success;
-    }
-
-    pPriv->target_sbc = target_sbc;
-    __DRI2BlockClient(client, pPriv);
-
-    return Success;
-}
-
-Bool
-DRI2HasSwapControl(ScreenPtr pScreen)
-{
-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
-
-    return (ds->ScheduleSwap && ds->GetMSC);
-}
-
-Bool
-DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
-	    const char **driverName, const char **deviceName)
-{
-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
-
-    if (ds == NULL || driverType >= ds->numDrivers ||
-	    !ds->driverNames[driverType])
-	return FALSE;
-
-    *fd = ds->fd;
-    *driverName = ds->driverNames[driverType];
-    *deviceName = ds->deviceName;
-
-    return TRUE;
-}
-
-Bool
-DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic)
-{
-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
-
-    if (ds == NULL || drmAuthMagic(ds->fd, magic))
-	return FALSE;
-
-    return TRUE;
-}
-
-Bool
-DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
-{
-    DRI2ScreenPtr ds;
-    const char* driverTypeNames[] = {
-	"DRI", /* DRI2DriverDRI */
-	"VDPAU", /* DRI2DriverVDPAU */
-    };
-    unsigned int i;
-    CARD8 cur_minor;
-
-    if (info->version < 3)
-	return FALSE;
-
-    if (!xf86VGAarbiterAllowDRI(pScreen)) {
-        xf86DrvMsg(pScreen->myNum, X_WARNING,
-                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
-        return FALSE;
-    }
-
-    ds = xcalloc(1, sizeof *ds);
-    if (!ds)
-	return FALSE;
-
-    ds->screen         = pScreen;
-    ds->fd	       = info->fd;
-    ds->deviceName     = info->deviceName;
-    dri2_major         = 1;
-
-    ds->CreateBuffer   = info->CreateBuffer;
-    ds->DestroyBuffer  = info->DestroyBuffer;
-    ds->CopyRegion     = info->CopyRegion;
-
-    if (info->version >= 4) {
-	ds->ScheduleSwap = info->ScheduleSwap;
-	ds->ScheduleWaitMSC = info->ScheduleWaitMSC;
-	ds->GetMSC = info->GetMSC;
-	cur_minor = 2;
-    } else {
-	cur_minor = 1;
-    }
-
-    /* Initialize minor if needed and set to minimum provied by DDX */
-    if (!dri2_minor || dri2_minor > cur_minor)
-	dri2_minor = cur_minor;
-
-    if (info->version == 3 || info->numDrivers == 0) {
-	/* Driver too old: use the old-style driverName field */
-	ds->numDrivers = 1;
-	ds->driverNames = xalloc(sizeof(*ds->driverNames));
-	if (!ds->driverNames) {
-	    xfree(ds);
-	    return FALSE;
-	}
-	ds->driverNames[0] = info->driverName;
-    } else {
-	ds->numDrivers = info->numDrivers;
-	ds->driverNames = xalloc(info->numDrivers * sizeof(*ds->driverNames));
-	if (!ds->driverNames) {
-	    xfree(ds);
-	    return FALSE;
-	}
-	memcpy(ds->driverNames, info->driverNames,
-	       info->numDrivers * sizeof(*ds->driverNames));
-    }
-
-    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
-
-    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
-    for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {
-	if (i < ds->numDrivers && ds->driverNames[i]) {
-	    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",
-		       driverTypeNames[i], ds->driverNames[i]);
-	}
-    }
-
-    return TRUE;
-}
-
-void
-DRI2CloseScreen(ScreenPtr pScreen)
-{
-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
-
-    xfree(ds->driverNames);
-    xfree(ds);
-    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
-}
-
-extern ExtensionModule dri2ExtensionModule;
-
-static pointer
-DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-    static Bool setupDone = FALSE;
-
-    dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");
-
-    if (!setupDone)
-    {
-	setupDone = TRUE;
-	LoadExtension(&dri2ExtensionModule, FALSE);
-    }
-    else
-    {
-	if (errmaj)
-	    *errmaj = LDR_ONCEONLY;
-    }
-
-    return (pointer) 1;
-}
-
-static XF86ModuleVersionInfo DRI2VersRec =
-{
-    "dri2",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    1, 2, 0,
-    ABI_CLASS_EXTENSION,
-    ABI_EXTENSION_VERSION,
-    MOD_CLASS_NONE,
-    { 0, 0, 0, 0 }
-};
-
-_X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };
-
-void
-DRI2Version(int *major, int *minor)
-{
-    if (major != NULL)
-	*major = DRI2VersRec.majorversion;
-
-    if (minor != NULL)
-	*minor = DRI2VersRec.minorversion;
-}
+/*

+ * Copyright © 2007, 2008 Red Hat, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Soft-

+ * ware"), to deal in the Software without restriction, including without

+ * limitation the rights to use, copy, modify, merge, publish, distribute,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, provided that the above copyright

+ * notice(s) and this permission notice appear in all copies of the Soft-

+ * ware and that both the above copyright notice(s) and this permission

+ * notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-

+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY

+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN

+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-

+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-

+ * MANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder shall

+ * not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization of

+ * the copyright holder.

+ *

+ * Authors:

+ *   Kristian Høgsberg (krh@redhat.com)

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <errno.h>

+#include <xf86drm.h>

+#include "xf86Module.h"

+#include "list.h"

+#include "scrnintstr.h"

+#include "windowstr.h"

+#include "dixstruct.h"

+#include "dri2.h"

+#include "xf86VGAarbiter.h"

+

+#include "xf86.h"

+

+CARD8 dri2_major; /* version of DRI2 supported by DDX */

+CARD8 dri2_minor;

+

+static int           dri2ScreenPrivateKeyIndex;

+static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKeyIndex;

+static int dri2WindowPrivateKeyIndex;

+static DevPrivateKey dri2WindowPrivateKey = &dri2WindowPrivateKeyIndex;

+static int dri2PixmapPrivateKeyIndex;

+static DevPrivateKey dri2PixmapPrivateKey = &dri2PixmapPrivateKeyIndex;

+static RESTYPE       dri2DrawableRes;

+

+typedef struct _DRI2Screen *DRI2ScreenPtr;

+

+typedef struct _DRI2Drawable {

+    DRI2ScreenPtr        dri2_screen;

+    DrawablePtr		 drawable;

+    struct list		 reference_list;

+    int			 width;

+    int			 height;

+    DRI2BufferPtr	*buffers;

+    int			 bufferCount;

+    unsigned int	 swapsPending;

+    ClientPtr		 blockedClient;

+    Bool		 blockedOnMsc;

+    int			 swap_interval;

+    CARD64		 swap_count;

+    int64_t		 target_sbc; /* -1 means no SBC wait outstanding */

+    CARD64		 last_swap_target; /* most recently queued swap target */

+    CARD64		 last_swap_msc; /* msc at completion of most recent swap */

+    CARD64		 last_swap_ust; /* ust at completion of most recent swap */

+    int			 swap_limit; /* for N-buffering */

+} DRI2DrawableRec, *DRI2DrawablePtr;

+

+typedef struct _DRI2Screen {

+    ScreenPtr			 screen;

+    int				 refcnt;

+    unsigned int		 numDrivers;

+    const char			**driverNames;

+    const char			*deviceName;

+    int				 fd;

+    unsigned int		 lastSequence;

+

+    DRI2CreateBufferProcPtr	 CreateBuffer;

+    DRI2DestroyBufferProcPtr	 DestroyBuffer;

+    DRI2CopyRegionProcPtr	 CopyRegion;

+    DRI2ScheduleSwapProcPtr	 ScheduleSwap;

+    DRI2GetMSCProcPtr		 GetMSC;

+    DRI2ScheduleWaitMSCProcPtr	 ScheduleWaitMSC;

+

+    HandleExposuresProcPtr       HandleExposures;

+} DRI2ScreenRec;

+

+static DRI2ScreenPtr

+DRI2GetScreen(ScreenPtr pScreen)

+{

+    return dixLookupPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey);

+}

+

+static DRI2DrawablePtr

+DRI2GetDrawable(DrawablePtr pDraw)

+{

+    WindowPtr pWin;

+    PixmapPtr pPixmap;

+

+    if (pDraw->type == DRAWABLE_WINDOW) {

+	pWin = (WindowPtr) pDraw;

+	return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);

+    } else {

+	pPixmap = (PixmapPtr) pDraw;

+	return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);

+    }

+}

+

+static DRI2DrawablePtr

+DRI2AllocateDrawable(DrawablePtr pDraw)

+{

+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv;

+    CARD64          ust;

+    WindowPtr pWin;

+    PixmapPtr pPixmap;

+

+    pPriv = xalloc(sizeof *pPriv);

+    if (pPriv == NULL)

+	return NULL;

+

+    pPriv->dri2_screen = ds;

+    pPriv->drawable = pDraw;

+    pPriv->width = pDraw->width;

+    pPriv->height = pDraw->height;

+    pPriv->buffers = NULL;

+    pPriv->bufferCount = 0;

+    pPriv->swapsPending = 0;

+    pPriv->blockedClient = NULL;

+    pPriv->blockedOnMsc = FALSE;

+    pPriv->swap_count = 0;

+    pPriv->target_sbc = -1;

+    pPriv->swap_interval = 1;

+    /* Initialize last swap target from DDX if possible */

+    if (!ds->GetMSC || !(*ds->GetMSC)(pDraw, &ust, &pPriv->last_swap_target))

+	pPriv->last_swap_target = 0;

+

+    pPriv->swap_limit = 1; /* default to double buffering */

+    pPriv->last_swap_msc = 0;

+    pPriv->last_swap_ust = 0;

+    list_init(&pPriv->reference_list);

+

+    if (pDraw->type == DRAWABLE_WINDOW) {

+	pWin = (WindowPtr) pDraw;

+	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv);

+    } else {

+	pPixmap = (PixmapPtr) pDraw;

+	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv);

+    }

+

+    return pPriv;

+}

+

+typedef struct DRI2DrawableRefRec {

+    XID id;

+    XID dri2_id;

+    struct list link;

+} DRI2DrawableRefRec, *DRI2DrawableRefPtr;

+

+static DRI2DrawableRefPtr

+DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)

+{

+    DRI2DrawableRefPtr ref;

+

+    list_for_each_entry(ref, &pPriv->reference_list, link) {

+	if (ref->id == id)

+	    return ref;

+    }

+    

+    return NULL;

+}

+

+static int

+DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id)

+{

+    DRI2DrawableRefPtr ref;

+

+    ref = malloc(sizeof *ref);

+    if (ref == NULL)

+	return BadAlloc;

+	

+    if (!AddResource(dri2_id, dri2DrawableRes, pPriv))

+	return BadAlloc;

+    if (!DRI2LookupDrawableRef(pPriv, id))

+	if (!AddResource(id, dri2DrawableRes, pPriv))

+	    return BadAlloc;

+

+    ref->id = id;

+    ref->dri2_id = dri2_id; 

+    list_add(&ref->link, &pPriv->reference_list);

+

+    return Success;

+}

+

+int

+DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id)

+{

+    DRI2DrawablePtr pPriv;

+    XID dri2_id;

+    int rc;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	pPriv = DRI2AllocateDrawable(pDraw);

+    if (pPriv == NULL)

+	return BadAlloc;

+    

+    dri2_id = FakeClientID(client->index);

+    rc = DRI2AddDrawableRef(pPriv, id, dri2_id);

+    if (rc != Success)

+	return rc;

+

+    return Success;

+}

+

+static int DRI2DrawableGone(pointer p, XID id)

+{

+    DRI2DrawablePtr pPriv = p;

+    DRI2ScreenPtr   ds = pPriv->dri2_screen;

+    DRI2DrawableRefPtr ref, next;

+    WindowPtr pWin;

+    PixmapPtr pPixmap;

+    DrawablePtr pDraw;

+    int i;

+

+    list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) {

+	if (ref->dri2_id == id) {

+	    list_del(&ref->link);

+	    /* If this was the last ref under this X drawable XID,

+	     * unregister the X drawable resource. */

+	    if (!DRI2LookupDrawableRef(pPriv, ref->id))

+		FreeResourceByType(ref->id, dri2DrawableRes, TRUE);

+	    free(ref);

+	    break;

+	}

+

+	if (ref->id == id) {

+	    list_del(&ref->link);

+	    FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE);

+	    free(ref);

+	}

+    }

+

+    if (!list_is_empty(&pPriv->reference_list))

+	return Success;

+

+    pDraw = pPriv->drawable;

+    if (pDraw->type == DRAWABLE_WINDOW) {

+	pWin = (WindowPtr) pDraw;

+	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);

+    } else {

+	pPixmap = (PixmapPtr) pDraw;

+	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);

+    }

+

+    if (pPriv->buffers != NULL) {

+	for (i = 0; i < pPriv->bufferCount; i++)

+	    (*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);

+

+	xfree(pPriv->buffers);

+    }

+

+    xfree(pPriv);

+

+    return Success;

+}

+

+static int

+find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)

+{

+    int i;

+

+    if (pPriv->buffers == NULL) {

+	return -1;

+    }

+

+    for (i = 0; i < pPriv->bufferCount; i++) {

+	if ((pPriv->buffers[i] != NULL)

+	    && (pPriv->buffers[i]->attachment == attachment)) {

+	    return i;

+	}

+    }

+

+    return -1;

+}

+

+static Bool

+allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,

+			 DRI2DrawablePtr pPriv,

+			 unsigned int attachment, unsigned int format,

+			 int dimensions_match, DRI2BufferPtr *buffer)

+{

+    int old_buf = find_attachment(pPriv, attachment);

+

+    if ((old_buf < 0)

+	|| !dimensions_match

+	|| (pPriv->buffers[old_buf]->format != format)) {

+	*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);

+	return TRUE;

+

+    } else {

+	*buffer = pPriv->buffers[old_buf];

+	pPriv->buffers[old_buf] = NULL;

+	return FALSE;

+    }

+}

+

+static DRI2BufferPtr *

+do_get_buffers(DrawablePtr pDraw, int *width, int *height,

+	       unsigned int *attachments, int count, int *out_count,

+	       int has_format)

+{

+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);

+    DRI2BufferPtr  *buffers;

+    int need_real_front = 0;

+    int need_fake_front = 0;

+    int have_fake_front = 0;

+    int front_format = 0;

+    int dimensions_match;

+    int buffers_changed = 0;

+    int i;

+

+    if (!pPriv) {

+	*width = pDraw->width;

+	*height = pDraw->height;

+	*out_count = 0;

+	return NULL;

+    }

+

+    dimensions_match = (pDraw->width == pPriv->width)

+	&& (pDraw->height == pPriv->height);

+

+    buffers = xalloc((count + 1) * sizeof(buffers[0]));

+

+    for (i = 0; i < count; i++) {

+	const unsigned attachment = *(attachments++);

+	const unsigned format = (has_format) ? *(attachments++) : 0;

+

+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,

+				     format, dimensions_match,

+				     &buffers[i]))

+		buffers_changed = 1;

+

+	/* If the drawable is a window and the front-buffer is requested,

+	 * silently add the fake front-buffer to the list of requested

+	 * attachments.  The counting logic in the loop accounts for the case

+	 * where the client requests both the fake and real front-buffer.

+	 */

+	if (attachment == DRI2BufferBackLeft) {

+	    need_real_front++;

+	    front_format = format;

+	}

+

+	if (attachment == DRI2BufferFrontLeft) {

+	    need_real_front--;

+	    front_format = format;

+

+	    if (pDraw->type == DRAWABLE_WINDOW) {

+		need_fake_front++;

+	    }

+	}

+

+	if (pDraw->type == DRAWABLE_WINDOW) {

+	    if (attachment == DRI2BufferFakeFrontLeft) {

+		need_fake_front--;

+		have_fake_front = 1;

+	    }

+	}

+    }

+

+    if (need_real_front > 0) {

+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,

+				     front_format, dimensions_match,

+				     &buffers[i++]))

+	    buffers_changed = 1;

+    }

+

+    if (need_fake_front > 0) {

+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,

+				     front_format, dimensions_match,

+				     &buffers[i++]))

+	    buffers_changed = 1;

+

+	have_fake_front = 1;

+    }

+

+    *out_count = i;

+

+

+    if (pPriv->buffers != NULL) {

+	for (i = 0; i < pPriv->bufferCount; i++) {

+	    if (pPriv->buffers[i] != NULL) {

+		(*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);

+	    }

+	}

+

+	xfree(pPriv->buffers);

+    }

+

+    pPriv->buffers = buffers;

+    pPriv->bufferCount = *out_count;

+    pPriv->width = pDraw->width;

+    pPriv->height = pDraw->height;

+    *width = pPriv->width;

+    *height = pPriv->height;

+

+

+    /* If the client is getting a fake front-buffer, pre-fill it with the

+     * contents of the real front-buffer.  This ensures correct operation of

+     * applications that call glXWaitX before calling glDrawBuffer.

+     */

+    if (have_fake_front && buffers_changed) {

+	BoxRec box;

+	RegionRec region;

+

+	box.x1 = 0;

+	box.y1 = 0;

+	box.x2 = pPriv->width;

+	box.y2 = pPriv->height;

+	REGION_INIT(pDraw->pScreen, &region, &box, 0);

+

+	DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,

+		       DRI2BufferFrontLeft);

+    }

+

+    return pPriv->buffers;

+}

+

+DRI2BufferPtr *

+DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,

+	       unsigned int *attachments, int count, int *out_count)

+{

+    return do_get_buffers(pDraw, width, height, attachments, count,

+			  out_count, FALSE);

+}

+

+DRI2BufferPtr *

+DRI2GetBuffersWithFormat(DrawablePtr pDraw, int *width, int *height,

+			 unsigned int *attachments, int count, int *out_count)

+{

+    return do_get_buffers(pDraw, width, height, attachments, count,

+			  out_count, TRUE);

+}

+

+/*

+ * In the direct rendered case, we throttle the clients that have more

+ * than their share of outstanding swaps (and thus busy buffers) when a

+ * new GetBuffers request is received.  In the AIGLX case, we allow the

+ * client to get the new buffers, but throttle when the next GLX request

+ * comes in (see __glXDRIcontextWait()).

+ */

+Bool

+DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw)

+{

+    DRI2DrawablePtr pPriv;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return FALSE;

+

+    /* Throttle to swap limit */

+    if ((pPriv->swapsPending >= pPriv->swap_limit) &&

+	!pPriv->blockedClient) {

+	ResetCurrentRequest(client);

+	client->sequence--;

+	IgnoreClient(client);

+	pPriv->blockedClient = client;

+	return TRUE;

+    }

+

+    return FALSE;

+}

+

+static void

+__DRI2BlockClient(ClientPtr client, DRI2DrawablePtr pPriv)

+{

+    if (pPriv->blockedClient == NULL) {

+	IgnoreClient(client);

+	pPriv->blockedClient = client;

+    }

+}

+

+void

+DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)

+{

+    DRI2DrawablePtr pPriv;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return;

+

+    __DRI2BlockClient(client, pPriv);

+    pPriv->blockedOnMsc = TRUE;

+}

+

+int

+DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,

+	       unsigned int dest, unsigned int src)

+{

+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv;

+    DRI2BufferPtr   pDestBuffer, pSrcBuffer;

+    int		    i;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return BadDrawable;

+

+    pDestBuffer = NULL;

+    pSrcBuffer = NULL;

+    for (i = 0; i < pPriv->bufferCount; i++)

+    {

+	if (pPriv->buffers[i]->attachment == dest)

+	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];

+	if (pPriv->buffers[i]->attachment == src)

+	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];

+    }

+    if (pSrcBuffer == NULL || pDestBuffer == NULL)

+	return BadValue;

+

+    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);

+

+    return Success;

+}

+

+/* Can this drawable be page flipped? */

+Bool

+DRI2CanFlip(DrawablePtr pDraw)

+{

+    ScreenPtr pScreen = pDraw->pScreen;

+    WindowPtr pWin, pRoot;

+    PixmapPtr pWinPixmap, pRootPixmap;

+

+    if (pDraw->type == DRAWABLE_PIXMAP)

+	return TRUE;

+

+    pRoot = WindowTable[pScreen->myNum];

+    pRootPixmap = pScreen->GetWindowPixmap(pRoot);

+

+    pWin = (WindowPtr) pDraw;

+    pWinPixmap = pScreen->GetWindowPixmap(pWin);

+    if (pRootPixmap != pWinPixmap)

+	return FALSE;

+    if (!REGION_EQUAL(pScreen, &pWin->clipList, &pRoot->winSize))

+	return FALSE;

+

+    return TRUE;

+}

+

+/* Can we do a pixmap exchange instead of a blit? */

+Bool

+DRI2CanExchange(DrawablePtr pDraw)

+{

+    return FALSE;

+}

+

+void

+DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,

+		    unsigned int tv_sec, unsigned int tv_usec)

+{

+    DRI2DrawablePtr pPriv;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return;

+

+    ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,

+			 frame, pPriv->swap_count);

+

+    if (pPriv->blockedClient)

+	AttendClient(pPriv->blockedClient);

+

+    pPriv->blockedClient = NULL;

+    pPriv->blockedOnMsc = FALSE;

+}

+

+static void

+DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,

+	       unsigned int tv_sec, unsigned int tv_usec)

+{

+    ScreenPtr	    pScreen = pDraw->pScreen;

+    DRI2DrawablePtr pPriv;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: bad drawable\n", __func__);

+	return;

+    }

+

+    /*

+     * Swap completed.

+     * Wake the client iff:

+     *   - it was waiting on SBC

+     *   - was blocked due to GLX make current

+     *   - was blocked due to swap throttling

+     *   - is not blocked due to an MSC wait

+     */

+    if (pPriv->target_sbc != -1 &&

+	pPriv->target_sbc <= pPriv->swap_count) {

+	ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,

+			     frame, pPriv->swap_count);

+	pPriv->target_sbc = -1;

+

+	AttendClient(pPriv->blockedClient);

+	pPriv->blockedClient = NULL;

+    } else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {

+	if (pPriv->blockedClient) {

+	    AttendClient(pPriv->blockedClient);

+	    pPriv->blockedClient = NULL;

+	}

+    }

+}

+

+void

+DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,

+		   unsigned int tv_sec, unsigned int tv_usec, int type,

+		   DRI2SwapEventPtr swap_complete, void *swap_data)

+{

+    ScreenPtr	    pScreen = pDraw->pScreen;

+    DRI2DrawablePtr pPriv;

+    CARD64          ust = 0;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: bad drawable\n", __func__);

+	return;

+    }

+

+    pPriv->swapsPending--;

+    pPriv->swap_count++;

+

+    ust = ((CARD64)tv_sec * 1000000) + tv_usec;

+    if (swap_complete)

+	swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);

+

+    pPriv->last_swap_msc = frame;

+    pPriv->last_swap_ust = ust;

+

+    DRI2WakeClient(client, pDraw, frame, tv_sec, tv_usec);

+}

+

+Bool

+DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)

+{

+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);

+

+    /* If we're currently waiting for a swap on this drawable, reset

+     * the request and suspend the client.  We only support one

+     * blocked client per drawable. */

+    if ((pPriv->swapsPending) &&

+	pPriv->blockedClient == NULL) {

+	ResetCurrentRequest(client);

+	client->sequence--;

+	__DRI2BlockClient(client, pPriv);

+	return TRUE;

+    }

+

+    return FALSE;

+}

+

+int

+DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,

+		CARD64 divisor, CARD64 remainder, CARD64 *swap_target,

+		DRI2SwapEventPtr func, void *data)

+{

+    ScreenPtr       pScreen = pDraw->pScreen;

+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv;

+    DRI2BufferPtr   pDestBuffer = NULL, pSrcBuffer = NULL;

+    int             ret, i;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: bad drawable\n", __func__);

+	return BadDrawable;

+    }

+

+    for (i = 0; i < pPriv->bufferCount; i++) {

+	if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)

+	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];

+	if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)

+	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];

+    }

+    if (pSrcBuffer == NULL || pDestBuffer == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: drawable has no back or front?\n", __func__);

+	return BadDrawable;

+    }

+

+    /* Old DDX or no swap interval, just blit */

+    if (!ds->ScheduleSwap || !pPriv->swap_interval) {

+	BoxRec box;

+	RegionRec region;

+

+	box.x1 = 0;

+	box.y1 = 0;

+	box.x2 = pDraw->width;

+	box.y2 = pDraw->height;

+	REGION_INIT(pScreen, &region, &box, 0);

+

+	pPriv->swapsPending++;

+

+	(*ds->CopyRegion)(pDraw, &region, pDestBuffer, pSrcBuffer);

+	DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,

+			 func, data);

+	return Success;

+    }

+

+    /*

+     * In the simple glXSwapBuffers case, all params will be 0, and we just

+     * need to schedule a swap for the last swap target + the swap interval.

+     */

+    if (target_msc == 0 && divisor == 0 && remainder == 0) {

+	/*

+	 * Swap target for this swap is last swap target + swap interval since

+	 * we have to account for the current swap count, interval, and the

+	 * number of pending swaps.

+	 */

+	*swap_target = pPriv->last_swap_target + pPriv->swap_interval;

+    } else {

+	/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */

+	*swap_target = target_msc;

+    }

+

+    pPriv->swapsPending++;

+    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,

+			      swap_target, divisor, remainder, func, data);

+    if (!ret) {

+	pPriv->swapsPending--; /* didn't schedule */

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: driver failed to schedule swap\n", __func__);

+	return BadDrawable;

+    }

+

+    pPriv->last_swap_target = *swap_target;

+

+    /* According to spec, return expected swapbuffers count SBC after this swap

+     * will complete.

+     */

+    *swap_target = pPriv->swap_count + pPriv->swapsPending;

+

+    return Success;

+}

+

+void

+DRI2SwapInterval(DrawablePtr pDrawable, int interval)

+{

+    ScreenPtr       pScreen = pDrawable->pScreen;

+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);

+

+    if (pPriv == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: bad drawable\n", __func__);

+	return;

+    }

+

+    /* fixme: check against arbitrary max? */

+    pPriv->swap_interval = interval;

+}

+

+int

+DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)

+{

+    ScreenPtr pScreen = pDraw->pScreen;

+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv;

+    Bool ret;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL) {

+        xf86DrvMsg(pScreen->myNum, X_ERROR,

+		   "[DRI2] %s: bad drawable\n", __func__);

+	return BadDrawable;

+    }

+

+    if (!ds->GetMSC) {

+	*ust = 0;

+	*msc = 0;

+	*sbc = pPriv->swap_count;

+	return Success;

+    }

+

+    /*

+     * Spec needs to be updated to include unmapped or redirected

+     * drawables

+     */

+

+    ret = (*ds->GetMSC)(pDraw, ust, msc);

+    if (!ret)

+	return BadDrawable;

+

+    *sbc = pPriv->swap_count;

+

+    return Success;

+}

+

+int

+DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,

+	    CARD64 divisor, CARD64 remainder)

+{

+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);

+    DRI2DrawablePtr pPriv;

+    Bool ret;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return BadDrawable;

+

+    /* Old DDX just completes immediately */

+    if (!ds->ScheduleWaitMSC) {

+	DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);

+

+	return Success;

+    }

+

+    ret = (*ds->ScheduleWaitMSC)(client, pDraw, target_msc, divisor, remainder);

+    if (!ret)

+	return BadDrawable;

+

+    return Success;

+}

+

+int

+DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc,

+	    CARD64 *ust, CARD64 *msc, CARD64 *sbc)

+{

+    DRI2DrawablePtr pPriv;

+

+    pPriv = DRI2GetDrawable(pDraw);

+    if (pPriv == NULL)

+	return BadDrawable;

+

+    /* target_sbc == 0 means to block until all pending swaps are

+     * finished. Recalculate target_sbc to get that behaviour.

+     */

+    if (target_sbc == 0)

+        target_sbc = pPriv->swap_count + pPriv->swapsPending;

+

+    /* If current swap count already >= target_sbc,

+     * return immediately with (ust, msc, sbc) triplet of

+     * most recent completed swap.

+     */

+    if (pPriv->swap_count >= target_sbc) {

+        *sbc = pPriv->swap_count;

+        *msc = pPriv->last_swap_msc;

+        *ust = pPriv->last_swap_ust;

+        return Success;

+    }

+

+    pPriv->target_sbc = target_sbc;

+    __DRI2BlockClient(client, pPriv);

+

+    return Success;

+}

+

+Bool

+DRI2HasSwapControl(ScreenPtr pScreen)

+{

+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

+

+    return (ds->ScheduleSwap && ds->GetMSC);

+}

+

+Bool

+DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,

+	    const char **driverName, const char **deviceName)

+{

+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

+

+    if (ds == NULL || driverType >= ds->numDrivers ||

+	    !ds->driverNames[driverType])

+	return FALSE;

+

+    *fd = ds->fd;

+    *driverName = ds->driverNames[driverType];

+    *deviceName = ds->deviceName;

+

+    return TRUE;

+}

+

+Bool

+DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic)

+{

+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

+

+    if (ds == NULL || drmAuthMagic(ds->fd, magic))

+	return FALSE;

+

+    return TRUE;

+}

+

+Bool

+DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)

+{

+    DRI2ScreenPtr ds;

+    const char* driverTypeNames[] = {

+	"DRI", /* DRI2DriverDRI */

+	"VDPAU", /* DRI2DriverVDPAU */

+    };

+    unsigned int i;

+    CARD8 cur_minor;

+

+    if (info->version < 3)

+	return FALSE;

+

+    if (!xf86VGAarbiterAllowDRI(pScreen)) {

+        xf86DrvMsg(pScreen->myNum, X_WARNING,

+                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");

+        return FALSE;

+    }

+

+    ds = xcalloc(1, sizeof *ds);

+    if (!ds)

+	return FALSE;

+

+    ds->screen         = pScreen;

+    ds->fd	       = info->fd;

+    ds->deviceName     = info->deviceName;

+    dri2_major         = 1;

+

+    ds->CreateBuffer   = info->CreateBuffer;

+    ds->DestroyBuffer  = info->DestroyBuffer;

+    ds->CopyRegion     = info->CopyRegion;

+

+    if (info->version >= 4) {

+	ds->ScheduleSwap = info->ScheduleSwap;

+	ds->ScheduleWaitMSC = info->ScheduleWaitMSC;

+	ds->GetMSC = info->GetMSC;

+	cur_minor = 2;

+    } else {

+	cur_minor = 1;

+    }

+

+    /* Initialize minor if needed and set to minimum provied by DDX */

+    if (!dri2_minor || dri2_minor > cur_minor)

+	dri2_minor = cur_minor;

+

+    if (info->version == 3 || info->numDrivers == 0) {

+	/* Driver too old: use the old-style driverName field */

+	ds->numDrivers = 1;

+	ds->driverNames = xalloc(sizeof(*ds->driverNames));

+	if (!ds->driverNames) {

+	    xfree(ds);

+	    return FALSE;

+	}

+	ds->driverNames[0] = info->driverName;

+    } else {

+	ds->numDrivers = info->numDrivers;

+	ds->driverNames = xalloc(info->numDrivers * sizeof(*ds->driverNames));

+	if (!ds->driverNames) {

+	    xfree(ds);

+	    return FALSE;

+	}

+	memcpy(ds->driverNames, info->driverNames,

+	       info->numDrivers * sizeof(*ds->driverNames));

+    }

+

+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);

+

+    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");

+    for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {

+	if (i < ds->numDrivers && ds->driverNames[i]) {

+	    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",

+		       driverTypeNames[i], ds->driverNames[i]);

+	}

+    }

+

+    return TRUE;

+}

+

+void

+DRI2CloseScreen(ScreenPtr pScreen)

+{

+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

+

+    xfree(ds->driverNames);

+    xfree(ds);

+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);

+}

+

+extern ExtensionModule dri2ExtensionModule;

+

+static pointer

+DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)

+{

+    static Bool setupDone = FALSE;

+

+    dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");

+

+    if (!setupDone)

+    {

+	setupDone = TRUE;

+	LoadExtension(&dri2ExtensionModule, FALSE);

+    }

+    else

+    {

+	if (errmaj)

+	    *errmaj = LDR_ONCEONLY;

+    }

+

+    return (pointer) 1;

+}

+

+static XF86ModuleVersionInfo DRI2VersRec =

+{

+    "dri2",

+    MODULEVENDORSTRING,

+    MODINFOSTRING1,

+    MODINFOSTRING2,

+    XORG_VERSION_CURRENT,

+    1, 2, 0,

+    ABI_CLASS_EXTENSION,

+    ABI_EXTENSION_VERSION,

+    MOD_CLASS_NONE,

+    { 0, 0, 0, 0 }

+};

+

+_X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };

+

+void

+DRI2Version(int *major, int *minor)

+{

+    if (major != NULL)

+	*major = DRI2VersRec.majorversion;

+

+    if (minor != NULL)

+	*minor = DRI2VersRec.minorversion;

+}

diff --git a/xorg-server/hw/xfree86/dri2/dri2.h b/xorg-server/hw/xfree86/dri2/dri2.h
index ce8a5df41..cc15f120d 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.h
+++ b/xorg-server/hw/xfree86/dri2/dri2.h
@@ -1,274 +1,275 @@
-/*
- * Copyright © 2007 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifndef _DRI2_H_
-#define _DRI2_H_
-
-#include <X11/extensions/dri2tokens.h>
-
-/* Version 2 structure (with format at the end) */
-typedef struct {
-    unsigned int attachment;
-    unsigned int name;
-    unsigned int pitch;
-    unsigned int cpp;
-    unsigned int flags;
-    unsigned int format;
-    void *driverPrivate;
-} DRI2BufferRec, *DRI2BufferPtr;
-
-extern CARD8 dri2_major; /* version of DRI2 supported by DDX */
-extern CARD8 dri2_minor;
-
-typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr;
-typedef void (*DRI2SwapEventPtr)(ClientPtr client, void *data, int type,
-				 CARD64 ust, CARD64 msc, CARD64 sbc);
-
-
-typedef DRI2BufferPtr	(*DRI2CreateBuffersProcPtr)(DrawablePtr pDraw,
-						    unsigned int *attachments,
-						    int count);
-typedef void		(*DRI2DestroyBuffersProcPtr)(DrawablePtr pDraw,
-						     DRI2BufferPtr buffers,
-						     int count);
-typedef void		(*DRI2CopyRegionProcPtr)(DrawablePtr pDraw,
-						 RegionPtr pRegion,
-						 DRI2BufferPtr pDestBuffer,
-						 DRI2BufferPtr pSrcBuffer);
-typedef void		(*DRI2WaitProcPtr)(WindowPtr pWin,
-					   unsigned int sequence);
-/**
- * Schedule a buffer swap
- *
- * This callback is used to support glXSwapBuffers and the OML_sync_control
- * extension (see it for a description of the params).
- *
- * Drivers should queue an event for the frame count that satisfies the
- * parameters passed in.  If the event is in the future (i.e. the conditions
- * aren't currently satisfied), the server may block the client at the next
- * GLX request using DRI2WaitSwap. When the event arrives, drivers should call
- * \c DRI2SwapComplete, which will handle waking the client and returning
- * the appropriate data.
- *
- * The DDX is responsible for doing a flip, exchange, or blit of the swap
- * when the corresponding event arrives.  The \c DRI2CanFlip and
- * \c DRI2CanExchange functions can be used as helpers for this purpose.
- *
- * \param client client pointer (used for block/unblock)
- * \param pDraw drawable whose count we want
- * \param pDestBuffer current front buffer
- * \param pSrcBuffer current back buffer
- * \param target_msc frame count to wait for
- * \param divisor divisor for condition equation
- * \param remainder remainder for division equation
- * \param func function to call when the swap completes
- * \param data data for the callback \p func.
- */
-typedef int		(*DRI2ScheduleSwapProcPtr)(ClientPtr client,
-						   DrawablePtr pDraw,
-						   DRI2BufferPtr pDestBuffer,
-						   DRI2BufferPtr pSrcBuffer,
-						   CARD64 *target_msc,
-						   CARD64 divisor,
-						   CARD64 remainder,
-						   DRI2SwapEventPtr func,
-						   void *data);
-typedef DRI2BufferPtr	(*DRI2CreateBufferProcPtr)(DrawablePtr pDraw,
-						   unsigned int attachment,
-						   unsigned int format);
-typedef void		(*DRI2DestroyBufferProcPtr)(DrawablePtr pDraw,
-						    DRI2BufferPtr buffer);
-/**
- * Get current media stamp counter values
- *
- * This callback is used to support the SGI_video_sync and OML_sync_control
- * extensions.
- *
- * Drivers should return the current frame counter and the timestamp from
- * when the returned frame count was last incremented.
- *
- * The count should correspond to the screen where the drawable is currently
- * visible.  If the drawable isn't visible (e.g. redirected), the server
- * should return BadDrawable to the client, pending GLX spec updates to
- * define this behavior.
- *
- * \param pDraw drawable whose count we want
- * \param ust timestamp from when the count was last incremented.
- * \param mst current frame count
- */
-typedef int		(*DRI2GetMSCProcPtr)(DrawablePtr pDraw, CARD64 *ust,
-					     CARD64 *msc);
-/**
- * Schedule a frame count related wait
- *
- * This callback is used to support the SGI_video_sync and OML_sync_control
- * extensions.  See those specifications for details on how to handle
- * the divisor and remainder parameters.
- *
- * Drivers should queue an event for the frame count that satisfies the
- * parameters passed in.  If the event is in the future (i.e. the conditions
- * aren't currently satisfied), the driver should block the client using
- * \c DRI2BlockClient.  When the event arrives, drivers should call
- * \c DRI2WaitMSCComplete, which will handle waking the client and returning
- * the appropriate data.
- *
- * \param client client pointer (used for block/unblock)
- * \param pDraw drawable whose count we want
- * \param target_msc frame count to wait for
- * \param divisor divisor for condition equation
- * \param remainder remainder for division equation
- */
-typedef int		(*DRI2ScheduleWaitMSCProcPtr)(ClientPtr client,
-						      DrawablePtr pDraw,
-						      CARD64 target_msc,
-						      CARD64 divisor,
-						      CARD64 remainder);
-/**
- * Version of the DRI2InfoRec structure defined in this header
- */
-#define DRI2INFOREC_VERSION 4
-
-typedef struct {
-    unsigned int version;	/**< Version of this struct */
-    int fd;
-    const char *driverName;
-    const char *deviceName;
-
-    DRI2CreateBufferProcPtr	CreateBuffer;
-    DRI2DestroyBufferProcPtr	DestroyBuffer;
-    DRI2CopyRegionProcPtr	CopyRegion;
-    DRI2WaitProcPtr		Wait;
-
-    /* added in version 4 */
-
-    DRI2ScheduleSwapProcPtr	ScheduleSwap;
-    DRI2GetMSCProcPtr		GetMSC;
-    DRI2ScheduleWaitMSCProcPtr	ScheduleWaitMSC;
-
-    /* number of drivers in the driverNames array */
-    unsigned int numDrivers;
-    /* array of driver names, indexed by DRI2Driver* driver types */
-    /* a name of NULL means that driver is not supported */
-    const char * const *driverNames;
-}  DRI2InfoRec, *DRI2InfoPtr;
-
-extern _X_EXPORT int DRI2EventBase;
-
-extern _X_EXPORT Bool DRI2ScreenInit(ScreenPtr	pScreen,
-		    DRI2InfoPtr info);
-
-extern _X_EXPORT void DRI2CloseScreen(ScreenPtr pScreen);
-
-extern _X_EXPORT Bool DRI2HasSwapControl(ScreenPtr pScreen);
-
-extern _X_EXPORT Bool DRI2Connect(ScreenPtr pScreen,
-		 unsigned int driverType,
-		 int *fd,
-		 const char **driverName,
-		 const char **deviceName);
-
-extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic);
-
-extern _X_EXPORT int DRI2CreateDrawable(DrawablePtr pDraw);
-
-extern _X_EXPORT void DRI2DestroyDrawable(DrawablePtr pDraw);
-
-extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw,
-			     int *width,
-			     int *height,
-			     unsigned int *attachments,
-			     int count,
-			     int *out_count);
-
-extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
-		   RegionPtr pRegion,
-		   unsigned int dest,
-		   unsigned int src);
-
-/**
- * Determine the major and minor version of the DRI2 extension.
- *
- * Provides a mechanism to other modules (e.g., 2D drivers) to determine the
- * version of the DRI2 extension.  While it is possible to peek directly at
- * the \c XF86ModuleData from a layered module, such a module will fail to
- * load (due to an unresolved symbol) if the DRI2 extension is not loaded.
- *
- * \param major  Location to store the major verion of the DRI2 extension
- * \param minor  Location to store the minor verion of the DRI2 extension
- *
- * \note
- * This interface was added some time after the initial release of the DRI2
- * module.  Layered modules that wish to use this interface must first test
- * its existance by calling \c xf86LoaderCheckSymbol.
- */
-extern _X_EXPORT void DRI2Version(int *major, int *minor);
-
-extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffersWithFormat(DrawablePtr pDraw,
-	int *width, int *height, unsigned int *attachments, int count,
-	int *out_count);
-
-extern _X_EXPORT void DRI2SwapInterval(DrawablePtr pDrawable, int interval);
-extern _X_EXPORT int DRI2SwapBuffers(ClientPtr client, DrawablePtr pDrawable,
-				     CARD64 target_msc, CARD64 divisor,
-				     CARD64 remainder, CARD64 *swap_target,
-				     DRI2SwapEventPtr func, void *data);
-extern _X_EXPORT Bool DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable);
-
-extern _X_EXPORT int DRI2GetMSC(DrawablePtr pDrawable, CARD64 *ust,
-				CARD64 *msc, CARD64 *sbc);
-extern _X_EXPORT int DRI2WaitMSC(ClientPtr client, DrawablePtr pDrawable,
-				 CARD64 target_msc, CARD64 divisor,
-				 CARD64 remainder);
-extern _X_EXPORT int ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust,
-					  CARD64 msc, CARD64 sbc);
-extern _X_EXPORT int DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw,
-				 CARD64 target_sbc, CARD64 *ust, CARD64 *msc,
-				 CARD64 *sbc);
-extern _X_EXPORT Bool DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw);
-
-extern _X_EXPORT Bool DRI2CanFlip(DrawablePtr pDraw);
-
-extern _X_EXPORT Bool DRI2CanExchange(DrawablePtr pDraw);
-
-/* Note: use *only* for MSC related waits */
-extern _X_EXPORT void DRI2BlockClient(ClientPtr client, DrawablePtr pDraw);
-
-extern _X_EXPORT void DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw,
-				       int frame, unsigned int tv_sec,
-				       unsigned int tv_usec, int type,
-				       DRI2SwapEventPtr swap_complete,
-				       void *swap_data);
-extern _X_EXPORT void DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw,
-					  int frame, unsigned int tv_sec,
-					  unsigned int tv_usec);
-
-#endif
+/*

+ * Copyright © 2007 Red Hat, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Soft-

+ * ware"), to deal in the Software without restriction, including without

+ * limitation the rights to use, copy, modify, merge, publish, distribute,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, provided that the above copyright

+ * notice(s) and this permission notice appear in all copies of the Soft-

+ * ware and that both the above copyright notice(s) and this permission

+ * notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-

+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY

+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN

+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-

+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-

+ * MANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder shall

+ * not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization of

+ * the copyright holder.

+ *

+ * Authors:

+ *   Kristian Høgsberg (krh@redhat.com)

+ */

+

+#ifndef _DRI2_H_

+#define _DRI2_H_

+

+#include <X11/extensions/dri2tokens.h>

+

+/* Version 2 structure (with format at the end) */

+typedef struct {

+    unsigned int attachment;

+    unsigned int name;

+    unsigned int pitch;

+    unsigned int cpp;

+    unsigned int flags;

+    unsigned int format;

+    void *driverPrivate;

+} DRI2BufferRec, *DRI2BufferPtr;

+

+extern CARD8 dri2_major; /* version of DRI2 supported by DDX */

+extern CARD8 dri2_minor;

+

+typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr;

+typedef void (*DRI2SwapEventPtr)(ClientPtr client, void *data, int type,

+				 CARD64 ust, CARD64 msc, CARD64 sbc);

+

+

+typedef DRI2BufferPtr	(*DRI2CreateBuffersProcPtr)(DrawablePtr pDraw,

+						    unsigned int *attachments,

+						    int count);

+typedef void		(*DRI2DestroyBuffersProcPtr)(DrawablePtr pDraw,

+						     DRI2BufferPtr buffers,

+						     int count);

+typedef void		(*DRI2CopyRegionProcPtr)(DrawablePtr pDraw,

+						 RegionPtr pRegion,

+						 DRI2BufferPtr pDestBuffer,

+						 DRI2BufferPtr pSrcBuffer);

+typedef void		(*DRI2WaitProcPtr)(WindowPtr pWin,

+					   unsigned int sequence);

+/**

+ * Schedule a buffer swap

+ *

+ * This callback is used to support glXSwapBuffers and the OML_sync_control

+ * extension (see it for a description of the params).

+ *

+ * Drivers should queue an event for the frame count that satisfies the

+ * parameters passed in.  If the event is in the future (i.e. the conditions

+ * aren't currently satisfied), the server may block the client at the next

+ * GLX request using DRI2WaitSwap. When the event arrives, drivers should call

+ * \c DRI2SwapComplete, which will handle waking the client and returning

+ * the appropriate data.

+ *

+ * The DDX is responsible for doing a flip, exchange, or blit of the swap

+ * when the corresponding event arrives.  The \c DRI2CanFlip and

+ * \c DRI2CanExchange functions can be used as helpers for this purpose.

+ *

+ * \param client client pointer (used for block/unblock)

+ * \param pDraw drawable whose count we want

+ * \param pDestBuffer current front buffer

+ * \param pSrcBuffer current back buffer

+ * \param target_msc frame count to wait for

+ * \param divisor divisor for condition equation

+ * \param remainder remainder for division equation

+ * \param func function to call when the swap completes

+ * \param data data for the callback \p func.

+ */

+typedef int		(*DRI2ScheduleSwapProcPtr)(ClientPtr client,

+						   DrawablePtr pDraw,

+						   DRI2BufferPtr pDestBuffer,

+						   DRI2BufferPtr pSrcBuffer,

+						   CARD64 *target_msc,

+						   CARD64 divisor,

+						   CARD64 remainder,

+						   DRI2SwapEventPtr func,

+						   void *data);

+typedef DRI2BufferPtr	(*DRI2CreateBufferProcPtr)(DrawablePtr pDraw,

+						   unsigned int attachment,

+						   unsigned int format);

+typedef void		(*DRI2DestroyBufferProcPtr)(DrawablePtr pDraw,

+						    DRI2BufferPtr buffer);

+/**

+ * Get current media stamp counter values

+ *

+ * This callback is used to support the SGI_video_sync and OML_sync_control

+ * extensions.

+ *

+ * Drivers should return the current frame counter and the timestamp from

+ * when the returned frame count was last incremented.

+ *

+ * The count should correspond to the screen where the drawable is currently

+ * visible.  If the drawable isn't visible (e.g. redirected), the server

+ * should return BadDrawable to the client, pending GLX spec updates to

+ * define this behavior.

+ *

+ * \param pDraw drawable whose count we want

+ * \param ust timestamp from when the count was last incremented.

+ * \param mst current frame count

+ */

+typedef int		(*DRI2GetMSCProcPtr)(DrawablePtr pDraw, CARD64 *ust,

+					     CARD64 *msc);

+/**

+ * Schedule a frame count related wait

+ *

+ * This callback is used to support the SGI_video_sync and OML_sync_control

+ * extensions.  See those specifications for details on how to handle

+ * the divisor and remainder parameters.

+ *

+ * Drivers should queue an event for the frame count that satisfies the

+ * parameters passed in.  If the event is in the future (i.e. the conditions

+ * aren't currently satisfied), the driver should block the client using

+ * \c DRI2BlockClient.  When the event arrives, drivers should call

+ * \c DRI2WaitMSCComplete, which will handle waking the client and returning

+ * the appropriate data.

+ *

+ * \param client client pointer (used for block/unblock)

+ * \param pDraw drawable whose count we want

+ * \param target_msc frame count to wait for

+ * \param divisor divisor for condition equation

+ * \param remainder remainder for division equation

+ */

+typedef int		(*DRI2ScheduleWaitMSCProcPtr)(ClientPtr client,

+						      DrawablePtr pDraw,

+						      CARD64 target_msc,

+						      CARD64 divisor,

+						      CARD64 remainder);

+/**

+ * Version of the DRI2InfoRec structure defined in this header

+ */

+#define DRI2INFOREC_VERSION 4

+

+typedef struct {

+    unsigned int version;	/**< Version of this struct */

+    int fd;

+    const char *driverName;

+    const char *deviceName;

+

+    DRI2CreateBufferProcPtr	CreateBuffer;

+    DRI2DestroyBufferProcPtr	DestroyBuffer;

+    DRI2CopyRegionProcPtr	CopyRegion;

+    DRI2WaitProcPtr		Wait;

+

+    /* added in version 4 */

+

+    DRI2ScheduleSwapProcPtr	ScheduleSwap;

+    DRI2GetMSCProcPtr		GetMSC;

+    DRI2ScheduleWaitMSCProcPtr	ScheduleWaitMSC;

+

+    /* number of drivers in the driverNames array */

+    unsigned int numDrivers;

+    /* array of driver names, indexed by DRI2Driver* driver types */

+    /* a name of NULL means that driver is not supported */

+    const char * const *driverNames;

+}  DRI2InfoRec, *DRI2InfoPtr;

+

+extern _X_EXPORT int DRI2EventBase;

+

+extern _X_EXPORT Bool DRI2ScreenInit(ScreenPtr	pScreen,

+		    DRI2InfoPtr info);

+

+extern _X_EXPORT void DRI2CloseScreen(ScreenPtr pScreen);

+

+extern _X_EXPORT Bool DRI2HasSwapControl(ScreenPtr pScreen);

+

+extern _X_EXPORT Bool DRI2Connect(ScreenPtr pScreen,

+		 unsigned int driverType,

+		 int *fd,

+		 const char **driverName,

+		 const char **deviceName);

+

+extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic);

+

+extern _X_EXPORT int DRI2CreateDrawable(ClientPtr client,

+					DrawablePtr pDraw, XID id);

+

+extern _X_EXPORT void DRI2DestroyDrawable(DrawablePtr pDraw);

+

+extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw,

+			     int *width,

+			     int *height,

+			     unsigned int *attachments,

+			     int count,

+			     int *out_count);

+

+extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,

+		   RegionPtr pRegion,

+		   unsigned int dest,

+		   unsigned int src);

+

+/**

+ * Determine the major and minor version of the DRI2 extension.

+ *

+ * Provides a mechanism to other modules (e.g., 2D drivers) to determine the

+ * version of the DRI2 extension.  While it is possible to peek directly at

+ * the \c XF86ModuleData from a layered module, such a module will fail to

+ * load (due to an unresolved symbol) if the DRI2 extension is not loaded.

+ *

+ * \param major  Location to store the major verion of the DRI2 extension

+ * \param minor  Location to store the minor verion of the DRI2 extension

+ *

+ * \note

+ * This interface was added some time after the initial release of the DRI2

+ * module.  Layered modules that wish to use this interface must first test

+ * its existance by calling \c xf86LoaderCheckSymbol.

+ */

+extern _X_EXPORT void DRI2Version(int *major, int *minor);

+

+extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffersWithFormat(DrawablePtr pDraw,

+	int *width, int *height, unsigned int *attachments, int count,

+	int *out_count);

+

+extern _X_EXPORT void DRI2SwapInterval(DrawablePtr pDrawable, int interval);

+extern _X_EXPORT int DRI2SwapBuffers(ClientPtr client, DrawablePtr pDrawable,

+				     CARD64 target_msc, CARD64 divisor,

+				     CARD64 remainder, CARD64 *swap_target,

+				     DRI2SwapEventPtr func, void *data);

+extern _X_EXPORT Bool DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable);

+

+extern _X_EXPORT int DRI2GetMSC(DrawablePtr pDrawable, CARD64 *ust,

+				CARD64 *msc, CARD64 *sbc);

+extern _X_EXPORT int DRI2WaitMSC(ClientPtr client, DrawablePtr pDrawable,

+				 CARD64 target_msc, CARD64 divisor,

+				 CARD64 remainder);

+extern _X_EXPORT int ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust,

+					  CARD64 msc, CARD64 sbc);

+extern _X_EXPORT int DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw,

+				 CARD64 target_sbc, CARD64 *ust, CARD64 *msc,

+				 CARD64 *sbc);

+extern _X_EXPORT Bool DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw);

+

+extern _X_EXPORT Bool DRI2CanFlip(DrawablePtr pDraw);

+

+extern _X_EXPORT Bool DRI2CanExchange(DrawablePtr pDraw);

+

+/* Note: use *only* for MSC related waits */

+extern _X_EXPORT void DRI2BlockClient(ClientPtr client, DrawablePtr pDraw);

+

+extern _X_EXPORT void DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw,

+				       int frame, unsigned int tv_sec,

+				       unsigned int tv_usec, int type,

+				       DRI2SwapEventPtr swap_complete,

+				       void *swap_data);

+extern _X_EXPORT void DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw,

+					  int frame, unsigned int tv_sec,

+					  unsigned int tv_usec);

+

+#endif

diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c
index 17df1304e..8bed02055 100644
--- a/xorg-server/hw/xfree86/dri2/dri2ext.c
+++ b/xorg-server/hw/xfree86/dri2/dri2ext.c
@@ -1,646 +1,646 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/dri2proto.h>
-#include <X11/extensions/xfixeswire.h>
-#include "dixstruct.h"
-#include "scrnintstr.h"
-#include "pixmapstr.h"
-#include "extnsionst.h"
-#include "xf86drm.h"
-#include "xfixes.h"
-#include "dri2.h"
-#include "protocol-versions.h"
-
-/* The only xf86 include */
-#include "xf86Module.h"
-
-static ExtensionEntry	*dri2Extension;
-
-static Bool
-validDrawable(ClientPtr client, XID drawable, Mask access_mode,
-	      DrawablePtr *pDrawable, int *status)
-{
-    *status = dixLookupDrawable(pDrawable, drawable, client, 0, access_mode);
-    if (*status != Success) {
-	client->errorValue = drawable;
-	return FALSE;
-    }
-
-    return TRUE;
-}
-
-static int
-ProcDRI2QueryVersion(ClientPtr client)
-{
-    REQUEST(xDRI2QueryVersionReq);
-    xDRI2QueryVersionReply rep;
-    int n;
-
-    if (client->swapped)
-	swaps(&stuff->length, n);
-
-    REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.majorVersion = dri2_major;
-    rep.minorVersion = dri2_minor;
-
-    if (client->swapped) {
-    	swaps(&rep.sequenceNumber, n);
-    	swapl(&rep.length, n);
-	swapl(&rep.majorVersion, n);
-	swapl(&rep.minorVersion, n);
-    }
-
-    WriteToClient(client, sizeof(xDRI2QueryVersionReply), &rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2Connect(ClientPtr client)
-{
-    REQUEST(xDRI2ConnectReq);
-    xDRI2ConnectReply rep;
-    DrawablePtr pDraw;
-    int fd, status;
-    const char *driverName;
-    const char *deviceName;
-
-    REQUEST_SIZE_MATCH(xDRI2ConnectReq);
-    if (!validDrawable(client, stuff->window, DixGetAttrAccess,
-		       &pDraw, &status))
-	return status;
-    
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.driverNameLength = 0;
-    rep.deviceNameLength = 0;
-
-    if (!DRI2Connect(pDraw->pScreen,
-		     stuff->driverType, &fd, &driverName, &deviceName))
-	goto fail;
-
-    rep.driverNameLength = strlen(driverName);
-    rep.deviceNameLength = strlen(deviceName);
-    rep.length = (rep.driverNameLength + 3) / 4 +
-	    (rep.deviceNameLength + 3) / 4;
-
- fail:
-    WriteToClient(client, sizeof(xDRI2ConnectReply), &rep);
-    WriteToClient(client, rep.driverNameLength, driverName);
-    WriteToClient(client, rep.deviceNameLength, deviceName);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2Authenticate(ClientPtr client)
-{
-    REQUEST(xDRI2AuthenticateReq);
-    xDRI2AuthenticateReply rep;
-    DrawablePtr pDraw;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2AuthenticateReq);
-    if (!validDrawable(client, stuff->window, DixGetAttrAccess,
-		       &pDraw, &status))
-	return status;
-
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    rep.authenticated = DRI2Authenticate(pDraw->pScreen, stuff->magic);
-    WriteToClient(client, sizeof(xDRI2AuthenticateReply), &rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2CreateDrawable(ClientPtr client)
-{
-    REQUEST(xDRI2CreateDrawableReq);
-    DrawablePtr pDrawable;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2CreateDrawableReq);
-
-    if (!validDrawable(client, stuff->drawable, DixAddAccess,
-		       &pDrawable, &status))
-	return status;
-
-    status = DRI2CreateDrawable(pDrawable);
-    if (status != Success)
-	return status;
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2DestroyDrawable(ClientPtr client)
-{
-    REQUEST(xDRI2DestroyDrawableReq);
-    DrawablePtr pDrawable;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2DestroyDrawableReq);
-    if (!validDrawable(client, stuff->drawable, DixRemoveAccess,
-		       &pDrawable, &status))
-	return status;
-
-    return client->noClientException;
-}
-
-
-static void
-send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
-		   DRI2BufferPtr *buffers, int count, int width, int height)
-{
-    xDRI2GetBuffersReply rep;
-    int skip = 0;
-    int i;
-
-    if (pDrawable->type == DRAWABLE_WINDOW) {
-	for (i = 0; i < count; i++) {
-	    /* Do not send the real front buffer of a window to the client.
-	     */
-	    if (buffers[i]->attachment == DRI2BufferFrontLeft) {
-		skip++;
-		continue;
-	    }
-	}
-    }
-
-    rep.type = X_Reply;
-    rep.length = (count - skip) * sizeof(xDRI2Buffer) / 4;
-    rep.sequenceNumber = client->sequence;
-    rep.width = width;
-    rep.height = height;
-    rep.count = count - skip;
-    WriteToClient(client, sizeof(xDRI2GetBuffersReply), &rep);
-
-    for (i = 0; i < count; i++) {
-	xDRI2Buffer buffer;
-
-	/* Do not send the real front buffer of a window to the client.
-	 */
-	if ((pDrawable->type == DRAWABLE_WINDOW)
-	    && (buffers[i]->attachment == DRI2BufferFrontLeft)) {
-	    continue;
-	}
-
-	buffer.attachment = buffers[i]->attachment;
-	buffer.name = buffers[i]->name;
-	buffer.pitch = buffers[i]->pitch;
-	buffer.cpp = buffers[i]->cpp;
-	buffer.flags = buffers[i]->flags;
-	WriteToClient(client, sizeof(xDRI2Buffer), &buffer);
-    }
-}
-
-
-static int
-ProcDRI2GetBuffers(ClientPtr client)
-{
-    REQUEST(xDRI2GetBuffersReq);
-    DrawablePtr pDrawable;
-    DRI2BufferPtr *buffers;
-    int status, width, height, count;
-    unsigned int *attachments;
-
-    REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * 4);
-    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
-
-    if (DRI2ThrottleClient(client, pDrawable))
-	return client->noClientException;
-
-    attachments = (unsigned int *) &stuff[1];
-    buffers = DRI2GetBuffers(pDrawable, &width, &height,
-			     attachments, stuff->count, &count);
-
-
-    send_buffers_reply(client, pDrawable, buffers, count, width, height);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2GetBuffersWithFormat(ClientPtr client)
-{
-    REQUEST(xDRI2GetBuffersReq);
-    DrawablePtr pDrawable;
-    DRI2BufferPtr *buffers;
-    int status, width, height, count;
-    unsigned int *attachments;
-
-    REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * (2 * 4));
-    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
-
-    if (DRI2ThrottleClient(client, pDrawable))
-	return client->noClientException;
-
-    attachments = (unsigned int *) &stuff[1];
-    buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height,
-				       attachments, stuff->count, &count);
-
-    send_buffers_reply(client, pDrawable, buffers, count, width, height);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2CopyRegion(ClientPtr client)
-{
-    REQUEST(xDRI2CopyRegionReq);
-    xDRI2CopyRegionReply rep;
-    DrawablePtr pDrawable;
-    int status;
-    RegionPtr pRegion;
-
-    REQUEST_SIZE_MATCH(xDRI2CopyRegionReq);
-
-    if (!validDrawable(client, stuff->drawable, DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
-
-    VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess);
-
-    status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src);
-    if (status != Success)
-	return status;
-
-    /* CopyRegion needs to be a round trip to make sure the X server
-     * queues the swap buffer rendering commands before the DRI client
-     * continues rendering.  The reply has a bitmask to signal the
-     * presense of optional return values as well, but we're not using
-     * that yet.
-     */
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-
-    WriteToClient(client, sizeof(xDRI2CopyRegionReply), &rep);
-
-    return client->noClientException;
-}
-
-static void
-load_swap_reply(xDRI2SwapBuffersReply *rep, CARD64 sbc)
-{
-    rep->swap_hi = sbc >> 32;
-    rep->swap_lo = sbc & 0xffffffff;
-}
-
-static CARD64
-vals_to_card64(CARD32 lo, CARD32 hi)
-{
-    return (CARD64)hi << 32 | lo;
-}
-
-static void
-DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,
-	      CARD64 sbc)
-{
-    xDRI2BufferSwapComplete event;
-    DrawablePtr pDrawable = data;
-
-    event.type = DRI2EventBase + DRI2_BufferSwapComplete;
-    event.sequenceNumber = client->sequence;
-    event.event_type = type;
-    event.drawable = pDrawable->id;
-    event.ust_hi = (CARD64)ust >> 32;
-    event.ust_lo = ust & 0xffffffff;
-    event.msc_hi = (CARD64)msc >> 32;
-    event.msc_lo = msc & 0xffffffff;
-    event.sbc_hi = (CARD64)sbc >> 32;
-    event.sbc_lo = sbc & 0xffffffff;
-
-    WriteEventsToClient(client, 1, (xEvent *)&event);
-}
-
-static int
-ProcDRI2SwapBuffers(ClientPtr client)
-{
-    REQUEST(xDRI2SwapBuffersReq);
-    xDRI2SwapBuffersReply rep;
-    DrawablePtr pDrawable;
-    CARD64 target_msc, divisor, remainder, swap_target;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2SwapBuffersReq);
-
-    if (!validDrawable(client, stuff->drawable,
-		       DixReadAccess | DixWriteAccess, &pDrawable, &status))
-	return status;
-
-    /*
-     * Ensures an out of control client can't exhaust our swap queue, and
-     * also orders swaps.
-     */
-    if (DRI2ThrottleClient(client, pDrawable))
-	return client->noClientException;
-
-    target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
-    divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
-    remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);
-
-    status = DRI2SwapBuffers(client, pDrawable, target_msc, divisor, remainder,
-			     &swap_target, DRI2SwapEvent, pDrawable);
-    if (status != Success)
-	return BadDrawable;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    load_swap_reply(&rep, swap_target);
-
-    WriteToClient(client, sizeof(xDRI2SwapBuffersReply), &rep);
-
-    return client->noClientException;
-}
-
-static void
-load_msc_reply(xDRI2MSCReply *rep, CARD64 ust, CARD64 msc, CARD64 sbc)
-{
-    rep->ust_hi = ust >> 32;
-    rep->ust_lo = ust & 0xffffffff;
-    rep->msc_hi = msc >> 32;
-    rep->msc_lo = msc & 0xffffffff;
-    rep->sbc_hi = sbc >> 32;
-    rep->sbc_lo = sbc & 0xffffffff;
-}
-
-static int
-ProcDRI2GetMSC(ClientPtr client)
-{
-    REQUEST(xDRI2GetMSCReq);
-    xDRI2MSCReply rep;
-    DrawablePtr pDrawable;
-    CARD64 ust, msc, sbc;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2GetMSCReq);
-
-    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
-
-    status = DRI2GetMSC(pDrawable, &ust, &msc, &sbc);
-    if (status != Success)
-	return status;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    load_msc_reply(&rep, ust, msc, sbc);
-
-    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2WaitMSC(ClientPtr client)
-{
-    REQUEST(xDRI2WaitMSCReq);
-    DrawablePtr pDrawable;
-    CARD64 target, divisor, remainder;
-    int status;
-
-    /* FIXME: in restart case, client may be gone at this point */
-
-    REQUEST_SIZE_MATCH(xDRI2WaitMSCReq);
-
-    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
-
-    target = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
-    divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
-    remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);
-
-    status = DRI2WaitMSC(client, pDrawable, target, divisor, remainder);
-    if (status != Success)
-	return status;
-
-    return client->noClientException;
-}
-
-int
-ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust, CARD64 msc, CARD64 sbc)
-{
-    xDRI2MSCReply rep;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    load_msc_reply(&rep, ust, msc, sbc);
-
-    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2SwapInterval(ClientPtr client)
-{
-    REQUEST(xDRI2SwapIntervalReq);
-    DrawablePtr pDrawable;
-    int status;
-
-    /* FIXME: in restart case, client may be gone at this point */
-
-    REQUEST_SIZE_MATCH(xDRI2SwapIntervalReq);
-
-    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,
-		       &pDrawable, &status))
-	return status;
-
-    DRI2SwapInterval(pDrawable, stuff->interval);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2WaitSBC(ClientPtr client)
-{
-    REQUEST(xDRI2WaitSBCReq);
-    xDRI2MSCReply rep;
-    DrawablePtr pDrawable;
-    CARD64 target, ust, msc, sbc;
-    int status;
-
-    REQUEST_SIZE_MATCH(xDRI2WaitSBCReq);
-
-    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,
-		       &status))
-	return status;
-
-    target = vals_to_card64(stuff->target_sbc_lo, stuff->target_sbc_hi);
-    status = DRI2WaitSBC(client, pDrawable, target, &ust, &msc, &sbc);
-    if (status != Success)
-	return status;
-
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    load_msc_reply(&rep, ust, msc, sbc);
-
-    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcDRI2Dispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-    
-    switch (stuff->data) {
-    case X_DRI2QueryVersion:
-	return ProcDRI2QueryVersion(client);
-    }
-
-    if (!LocalClient(client))
-	return BadRequest;
-
-    switch (stuff->data) {
-    case X_DRI2Connect:
-	return ProcDRI2Connect(client);
-    case X_DRI2Authenticate:
-	return ProcDRI2Authenticate(client);
-    case X_DRI2CreateDrawable:
-	return ProcDRI2CreateDrawable(client);
-    case X_DRI2DestroyDrawable:
-	return ProcDRI2DestroyDrawable(client);
-    case X_DRI2GetBuffers:
-	return ProcDRI2GetBuffers(client);
-    case X_DRI2CopyRegion:
-	return ProcDRI2CopyRegion(client);
-    case X_DRI2GetBuffersWithFormat:
-	return ProcDRI2GetBuffersWithFormat(client);
-    case X_DRI2SwapBuffers:
-	return ProcDRI2SwapBuffers(client);
-    case X_DRI2GetMSC:
-	return ProcDRI2GetMSC(client);
-    case X_DRI2WaitMSC:
-	return ProcDRI2WaitMSC(client);
-    case X_DRI2WaitSBC:
-	return ProcDRI2WaitSBC(client);
-    case X_DRI2SwapInterval:
-	return ProcDRI2SwapInterval(client);
-    default:
-	return BadRequest;
-    }
-}
-
-static int
-SProcDRI2Connect(ClientPtr client)
-{
-    REQUEST(xDRI2ConnectReq);
-    xDRI2ConnectReply rep;
-    int n;
-
-    /* If the client is swapped, it's not local.  Talk to the hand. */
-
-    swaps(&stuff->length, n);
-    if (sizeof(*stuff) / 4 != client->req_len)
-	return BadLength;
-
-    rep.sequenceNumber = client->sequence;
-    swaps(&rep.sequenceNumber, n);
-    rep.length = 0;
-    rep.driverNameLength = 0;
-    rep.deviceNameLength = 0;
-
-    return client->noClientException;
-}
-
-static int
-SProcDRI2Dispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-
-    /*
-     * Only local clients are allowed DRI access, but remote clients
-     * still need these requests to find out cleanly.
-     */
-    switch (stuff->data)
-    {
-    case X_DRI2QueryVersion:
-	return ProcDRI2QueryVersion(client);
-    case X_DRI2Connect:
-	return SProcDRI2Connect(client);
-    default:
-	return BadRequest;
-    }
-}
-
-int DRI2EventBase;
-
-static void
-DRI2ExtensionInit(void)
-{
-    dri2Extension = AddExtension(DRI2_NAME,
-				 DRI2NumberEvents,
-				 DRI2NumberErrors,
-				 ProcDRI2Dispatch,
-				 SProcDRI2Dispatch,
-				 NULL,
-				 StandardMinorOpcode);
-
-    DRI2EventBase = dri2Extension->eventBase;
-}
-
-extern Bool noDRI2Extension;
-
-_X_HIDDEN ExtensionModule dri2ExtensionModule = {
-    DRI2ExtensionInit,
-    DRI2_NAME,
-    &noDRI2Extension,
-    NULL,
-    NULL
-};
+/*

+ * Copyright © 2008 Red Hat, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Soft-

+ * ware"), to deal in the Software without restriction, including without

+ * limitation the rights to use, copy, modify, merge, publish, distribute,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, provided that the above copyright

+ * notice(s) and this permission notice appear in all copies of the Soft-

+ * ware and that both the above copyright notice(s) and this permission

+ * notice appear in supporting documentation.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-

+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY

+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN

+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-

+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-

+ * MANCE OF THIS SOFTWARE.

+ *

+ * Except as contained in this notice, the name of a copyright holder shall

+ * not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization of

+ * the copyright holder.

+ *

+ * Authors:

+ *   Kristian Høgsberg (krh@redhat.com)

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/extensions/dri2proto.h>

+#include <X11/extensions/xfixeswire.h>

+#include "dixstruct.h"

+#include "scrnintstr.h"

+#include "pixmapstr.h"

+#include "extnsionst.h"

+#include "xf86drm.h"

+#include "xfixes.h"

+#include "dri2.h"

+#include "protocol-versions.h"

+

+/* The only xf86 include */

+#include "xf86Module.h"

+

+static ExtensionEntry	*dri2Extension;

+

+static Bool

+validDrawable(ClientPtr client, XID drawable, Mask access_mode,

+	      DrawablePtr *pDrawable, int *status)

+{

+    *status = dixLookupDrawable(pDrawable, drawable, client, 0, access_mode);

+    if (*status != Success) {

+	client->errorValue = drawable;

+	return FALSE;

+    }

+

+    return TRUE;

+}

+

+static int

+ProcDRI2QueryVersion(ClientPtr client)

+{

+    REQUEST(xDRI2QueryVersionReq);

+    xDRI2QueryVersionReply rep;

+    int n;

+

+    if (client->swapped)

+	swaps(&stuff->length, n);

+

+    REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.majorVersion = dri2_major;

+    rep.minorVersion = dri2_minor;

+

+    if (client->swapped) {

+    	swaps(&rep.sequenceNumber, n);

+    	swapl(&rep.length, n);

+	swapl(&rep.majorVersion, n);

+	swapl(&rep.minorVersion, n);

+    }

+

+    WriteToClient(client, sizeof(xDRI2QueryVersionReply), &rep);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2Connect(ClientPtr client)

+{

+    REQUEST(xDRI2ConnectReq);

+    xDRI2ConnectReply rep;

+    DrawablePtr pDraw;

+    int fd, status;

+    const char *driverName;

+    const char *deviceName;

+

+    REQUEST_SIZE_MATCH(xDRI2ConnectReq);

+    if (!validDrawable(client, stuff->window, DixGetAttrAccess,

+		       &pDraw, &status))

+	return status;

+    

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.driverNameLength = 0;

+    rep.deviceNameLength = 0;

+

+    if (!DRI2Connect(pDraw->pScreen,

+		     stuff->driverType, &fd, &driverName, &deviceName))

+	goto fail;

+

+    rep.driverNameLength = strlen(driverName);

+    rep.deviceNameLength = strlen(deviceName);

+    rep.length = (rep.driverNameLength + 3) / 4 +

+	    (rep.deviceNameLength + 3) / 4;

+

+ fail:

+    WriteToClient(client, sizeof(xDRI2ConnectReply), &rep);

+    WriteToClient(client, rep.driverNameLength, driverName);

+    WriteToClient(client, rep.deviceNameLength, deviceName);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2Authenticate(ClientPtr client)

+{

+    REQUEST(xDRI2AuthenticateReq);

+    xDRI2AuthenticateReply rep;

+    DrawablePtr pDraw;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2AuthenticateReq);

+    if (!validDrawable(client, stuff->window, DixGetAttrAccess,

+		       &pDraw, &status))

+	return status;

+

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    rep.authenticated = DRI2Authenticate(pDraw->pScreen, stuff->magic);

+    WriteToClient(client, sizeof(xDRI2AuthenticateReply), &rep);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2CreateDrawable(ClientPtr client)

+{

+    REQUEST(xDRI2CreateDrawableReq);

+    DrawablePtr pDrawable;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2CreateDrawableReq);

+

+    if (!validDrawable(client, stuff->drawable, DixAddAccess,

+		       &pDrawable, &status))

+	return status;

+

+    status = DRI2CreateDrawable(client, pDrawable, stuff->drawable);

+    if (status != Success)

+	return status;

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2DestroyDrawable(ClientPtr client)

+{

+    REQUEST(xDRI2DestroyDrawableReq);

+    DrawablePtr pDrawable;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2DestroyDrawableReq);

+    if (!validDrawable(client, stuff->drawable, DixRemoveAccess,

+		       &pDrawable, &status))

+	return status;

+

+    return client->noClientException;

+}

+

+

+static void

+send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,

+		   DRI2BufferPtr *buffers, int count, int width, int height)

+{

+    xDRI2GetBuffersReply rep;

+    int skip = 0;

+    int i;

+

+    if (pDrawable->type == DRAWABLE_WINDOW) {

+	for (i = 0; i < count; i++) {

+	    /* Do not send the real front buffer of a window to the client.

+	     */

+	    if (buffers[i]->attachment == DRI2BufferFrontLeft) {

+		skip++;

+		continue;

+	    }

+	}

+    }

+

+    rep.type = X_Reply;

+    rep.length = (count - skip) * sizeof(xDRI2Buffer) / 4;

+    rep.sequenceNumber = client->sequence;

+    rep.width = width;

+    rep.height = height;

+    rep.count = count - skip;

+    WriteToClient(client, sizeof(xDRI2GetBuffersReply), &rep);

+

+    for (i = 0; i < count; i++) {

+	xDRI2Buffer buffer;

+

+	/* Do not send the real front buffer of a window to the client.

+	 */

+	if ((pDrawable->type == DRAWABLE_WINDOW)

+	    && (buffers[i]->attachment == DRI2BufferFrontLeft)) {

+	    continue;

+	}

+

+	buffer.attachment = buffers[i]->attachment;

+	buffer.name = buffers[i]->name;

+	buffer.pitch = buffers[i]->pitch;

+	buffer.cpp = buffers[i]->cpp;

+	buffer.flags = buffers[i]->flags;

+	WriteToClient(client, sizeof(xDRI2Buffer), &buffer);

+    }

+}

+

+

+static int

+ProcDRI2GetBuffers(ClientPtr client)

+{

+    REQUEST(xDRI2GetBuffersReq);

+    DrawablePtr pDrawable;

+    DRI2BufferPtr *buffers;

+    int status, width, height, count;

+    unsigned int *attachments;

+

+    REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * 4);

+    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,

+		       &pDrawable, &status))

+	return status;

+

+    if (DRI2ThrottleClient(client, pDrawable))

+	return client->noClientException;

+

+    attachments = (unsigned int *) &stuff[1];

+    buffers = DRI2GetBuffers(pDrawable, &width, &height,

+			     attachments, stuff->count, &count);

+

+

+    send_buffers_reply(client, pDrawable, buffers, count, width, height);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2GetBuffersWithFormat(ClientPtr client)

+{

+    REQUEST(xDRI2GetBuffersReq);

+    DrawablePtr pDrawable;

+    DRI2BufferPtr *buffers;

+    int status, width, height, count;

+    unsigned int *attachments;

+

+    REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * (2 * 4));

+    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,

+		       &pDrawable, &status))

+	return status;

+

+    if (DRI2ThrottleClient(client, pDrawable))

+	return client->noClientException;

+

+    attachments = (unsigned int *) &stuff[1];

+    buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height,

+				       attachments, stuff->count, &count);

+

+    send_buffers_reply(client, pDrawable, buffers, count, width, height);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2CopyRegion(ClientPtr client)

+{

+    REQUEST(xDRI2CopyRegionReq);

+    xDRI2CopyRegionReply rep;

+    DrawablePtr pDrawable;

+    int status;

+    RegionPtr pRegion;

+

+    REQUEST_SIZE_MATCH(xDRI2CopyRegionReq);

+

+    if (!validDrawable(client, stuff->drawable, DixWriteAccess,

+		       &pDrawable, &status))

+	return status;

+

+    VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess);

+

+    status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src);

+    if (status != Success)

+	return status;

+

+    /* CopyRegion needs to be a round trip to make sure the X server

+     * queues the swap buffer rendering commands before the DRI client

+     * continues rendering.  The reply has a bitmask to signal the

+     * presense of optional return values as well, but we're not using

+     * that yet.

+     */

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    WriteToClient(client, sizeof(xDRI2CopyRegionReply), &rep);

+

+    return client->noClientException;

+}

+

+static void

+load_swap_reply(xDRI2SwapBuffersReply *rep, CARD64 sbc)

+{

+    rep->swap_hi = sbc >> 32;

+    rep->swap_lo = sbc & 0xffffffff;

+}

+

+static CARD64

+vals_to_card64(CARD32 lo, CARD32 hi)

+{

+    return (CARD64)hi << 32 | lo;

+}

+

+static void

+DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,

+	      CARD64 sbc)

+{

+    xDRI2BufferSwapComplete event;

+    DrawablePtr pDrawable = data;

+

+    event.type = DRI2EventBase + DRI2_BufferSwapComplete;

+    event.sequenceNumber = client->sequence;

+    event.event_type = type;

+    event.drawable = pDrawable->id;

+    event.ust_hi = (CARD64)ust >> 32;

+    event.ust_lo = ust & 0xffffffff;

+    event.msc_hi = (CARD64)msc >> 32;

+    event.msc_lo = msc & 0xffffffff;

+    event.sbc_hi = (CARD64)sbc >> 32;

+    event.sbc_lo = sbc & 0xffffffff;

+

+    WriteEventsToClient(client, 1, (xEvent *)&event);

+}

+

+static int

+ProcDRI2SwapBuffers(ClientPtr client)

+{

+    REQUEST(xDRI2SwapBuffersReq);

+    xDRI2SwapBuffersReply rep;

+    DrawablePtr pDrawable;

+    CARD64 target_msc, divisor, remainder, swap_target;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2SwapBuffersReq);

+

+    if (!validDrawable(client, stuff->drawable,

+		       DixReadAccess | DixWriteAccess, &pDrawable, &status))

+	return status;

+

+    /*

+     * Ensures an out of control client can't exhaust our swap queue, and

+     * also orders swaps.

+     */

+    if (DRI2ThrottleClient(client, pDrawable))

+	return client->noClientException;

+

+    target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);

+    divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);

+    remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);

+

+    status = DRI2SwapBuffers(client, pDrawable, target_msc, divisor, remainder,

+			     &swap_target, DRI2SwapEvent, pDrawable);

+    if (status != Success)

+	return BadDrawable;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    load_swap_reply(&rep, swap_target);

+

+    WriteToClient(client, sizeof(xDRI2SwapBuffersReply), &rep);

+

+    return client->noClientException;

+}

+

+static void

+load_msc_reply(xDRI2MSCReply *rep, CARD64 ust, CARD64 msc, CARD64 sbc)

+{

+    rep->ust_hi = ust >> 32;

+    rep->ust_lo = ust & 0xffffffff;

+    rep->msc_hi = msc >> 32;

+    rep->msc_lo = msc & 0xffffffff;

+    rep->sbc_hi = sbc >> 32;

+    rep->sbc_lo = sbc & 0xffffffff;

+}

+

+static int

+ProcDRI2GetMSC(ClientPtr client)

+{

+    REQUEST(xDRI2GetMSCReq);

+    xDRI2MSCReply rep;

+    DrawablePtr pDrawable;

+    CARD64 ust, msc, sbc;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2GetMSCReq);

+

+    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,

+		       &status))

+	return status;

+

+    status = DRI2GetMSC(pDrawable, &ust, &msc, &sbc);

+    if (status != Success)

+	return status;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    load_msc_reply(&rep, ust, msc, sbc);

+

+    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2WaitMSC(ClientPtr client)

+{

+    REQUEST(xDRI2WaitMSCReq);

+    DrawablePtr pDrawable;

+    CARD64 target, divisor, remainder;

+    int status;

+

+    /* FIXME: in restart case, client may be gone at this point */

+

+    REQUEST_SIZE_MATCH(xDRI2WaitMSCReq);

+

+    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,

+		       &status))

+	return status;

+

+    target = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);

+    divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);

+    remainder = vals_to_card64(stuff->remainder_lo, stuff->remainder_hi);

+

+    status = DRI2WaitMSC(client, pDrawable, target, divisor, remainder);

+    if (status != Success)

+	return status;

+

+    return client->noClientException;

+}

+

+int

+ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust, CARD64 msc, CARD64 sbc)

+{

+    xDRI2MSCReply rep;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    load_msc_reply(&rep, ust, msc, sbc);

+

+    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2SwapInterval(ClientPtr client)

+{

+    REQUEST(xDRI2SwapIntervalReq);

+    DrawablePtr pDrawable;

+    int status;

+

+    /* FIXME: in restart case, client may be gone at this point */

+

+    REQUEST_SIZE_MATCH(xDRI2SwapIntervalReq);

+

+    if (!validDrawable(client, stuff->drawable, DixReadAccess | DixWriteAccess,

+		       &pDrawable, &status))

+	return status;

+

+    DRI2SwapInterval(pDrawable, stuff->interval);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2WaitSBC(ClientPtr client)

+{

+    REQUEST(xDRI2WaitSBCReq);

+    xDRI2MSCReply rep;

+    DrawablePtr pDrawable;

+    CARD64 target, ust, msc, sbc;

+    int status;

+

+    REQUEST_SIZE_MATCH(xDRI2WaitSBCReq);

+

+    if (!validDrawable(client, stuff->drawable, DixReadAccess, &pDrawable,

+		       &status))

+	return status;

+

+    target = vals_to_card64(stuff->target_sbc_lo, stuff->target_sbc_hi);

+    status = DRI2WaitSBC(client, pDrawable, target, &ust, &msc, &sbc);

+    if (status != Success)

+	return status;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    load_msc_reply(&rep, ust, msc, sbc);

+

+    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);

+

+    return client->noClientException;

+}

+

+static int

+ProcDRI2Dispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+    

+    switch (stuff->data) {

+    case X_DRI2QueryVersion:

+	return ProcDRI2QueryVersion(client);

+    }

+

+    if (!LocalClient(client))

+	return BadRequest;

+

+    switch (stuff->data) {

+    case X_DRI2Connect:

+	return ProcDRI2Connect(client);

+    case X_DRI2Authenticate:

+	return ProcDRI2Authenticate(client);

+    case X_DRI2CreateDrawable:

+	return ProcDRI2CreateDrawable(client);

+    case X_DRI2DestroyDrawable:

+	return ProcDRI2DestroyDrawable(client);

+    case X_DRI2GetBuffers:

+	return ProcDRI2GetBuffers(client);

+    case X_DRI2CopyRegion:

+	return ProcDRI2CopyRegion(client);

+    case X_DRI2GetBuffersWithFormat:

+	return ProcDRI2GetBuffersWithFormat(client);

+    case X_DRI2SwapBuffers:

+	return ProcDRI2SwapBuffers(client);

+    case X_DRI2GetMSC:

+	return ProcDRI2GetMSC(client);

+    case X_DRI2WaitMSC:

+	return ProcDRI2WaitMSC(client);

+    case X_DRI2WaitSBC:

+	return ProcDRI2WaitSBC(client);

+    case X_DRI2SwapInterval:

+	return ProcDRI2SwapInterval(client);

+    default:

+	return BadRequest;

+    }

+}

+

+static int

+SProcDRI2Connect(ClientPtr client)

+{

+    REQUEST(xDRI2ConnectReq);

+    xDRI2ConnectReply rep;

+    int n;

+

+    /* If the client is swapped, it's not local.  Talk to the hand. */

+

+    swaps(&stuff->length, n);

+    if (sizeof(*stuff) / 4 != client->req_len)

+	return BadLength;

+

+    rep.sequenceNumber = client->sequence;

+    swaps(&rep.sequenceNumber, n);

+    rep.length = 0;

+    rep.driverNameLength = 0;

+    rep.deviceNameLength = 0;

+

+    return client->noClientException;

+}

+

+static int

+SProcDRI2Dispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+

+    /*

+     * Only local clients are allowed DRI access, but remote clients

+     * still need these requests to find out cleanly.

+     */

+    switch (stuff->data)

+    {

+    case X_DRI2QueryVersion:

+	return ProcDRI2QueryVersion(client);

+    case X_DRI2Connect:

+	return SProcDRI2Connect(client);

+    default:

+	return BadRequest;

+    }

+}

+

+int DRI2EventBase;

+

+static void

+DRI2ExtensionInit(void)

+{

+    dri2Extension = AddExtension(DRI2_NAME,

+				 DRI2NumberEvents,

+				 DRI2NumberErrors,

+				 ProcDRI2Dispatch,

+				 SProcDRI2Dispatch,

+				 NULL,

+				 StandardMinorOpcode);

+

+    DRI2EventBase = dri2Extension->eventBase;

+}

+

+extern Bool noDRI2Extension;

+

+_X_HIDDEN ExtensionModule dri2ExtensionModule = {

+    DRI2ExtensionInit,

+    DRI2_NAME,

+    &noDRI2Extension,

+    NULL,

+    NULL

+};

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index f90ecc227..3e765e6ff 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -1,672 +1,672 @@
-/*
- * Copyright © 2007 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#endif
-
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "xf86.h"
-#include "xf86DDC.h"
-#include "xf86Crtc.h"
-#include "xf86Modes.h"
-#include "xf86RandR12.h"
-#include "xf86CursorPriv.h"
-#include "X11/extensions/render.h"
-#include "X11/extensions/dpmsconst.h"
-#include "X11/Xatom.h"
-#include "picturestr.h"
-#include "cursorstr.h"
-#include "inputstr.h"
-
-/*
- * Given a screen coordinate, rotate back to a cursor source coordinate
- */
-static void
-xf86_crtc_rotate_coord (Rotation    rotation,
-			int	    width,
-			int	    height,
-			int	    x_dst,
-			int	    y_dst,
-			int	    *x_src,
-			int	    *y_src)
-{
-    int t;
-    
-    switch (rotation & 0xf) {
-    case RR_Rotate_0:
-	break;
-    case RR_Rotate_90:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
-    case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
-    case RR_Rotate_270:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
-    }
-    if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
-    if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
-    *x_src = x_dst;
-    *y_src = y_dst;
-}
-
-/*
- * Given a cursor source  coordinate, rotate to a screen coordinate
- */
-static void
-xf86_crtc_rotate_coord_back (Rotation    rotation,
-			     int	    width,
-			     int	    height,
-			     int	    x_dst,
-			     int	    y_dst,
-			     int	    *x_src,
-			     int	    *y_src)
-{
-    int t;
-    
-    if (rotation & RR_Reflect_X)
-	x_dst = width - x_dst - 1;
-    if (rotation & RR_Reflect_Y)
-	y_dst = height - y_dst - 1;
-
-    switch (rotation & 0xf) {
-    case RR_Rotate_0:
-	break;
-    case RR_Rotate_90:
-	t = x_dst;
-	x_dst = y_dst;
-	y_dst = width - t - 1;
-	break;
-    case RR_Rotate_180:
-	x_dst = width - x_dst - 1;
-	y_dst = height - y_dst - 1;
-	break;
-    case RR_Rotate_270:
-	t = x_dst;
-	x_dst = height - y_dst - 1;
-	y_dst = t;
-	break;
-    }
-    *x_src = x_dst;
-    *y_src = y_dst;
-}
-
-/*
- * Convert an x coordinate to a position within the cursor bitmap
- */
-static int
-cursor_bitpos (int flags, int x, Bool mask)
-{
-    if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)
-	mask = !mask;
-    if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
-	x = (x & ~3) | (3 - (x & 3));
-    if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
-	(X_BYTE_ORDER == X_BIG_ENDIAN))
-	x = (x & ~7) | (7 - (x & 7));
-    if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
-	x = (x << 1) + mask;
-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)
-	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)
-	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)
-	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)
-	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
-    return x;
-}
-
-/*
- * Fetch one bit from a cursor bitmap
- */
-static CARD8
-get_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask)
-{
-    x = cursor_bitpos (flags, x, mask);
-    image += y * stride;
-    return (image[(x >> 3)] >> (x & 7)) & 1;
-}
-
-/*
- * Set one bit in a cursor bitmap
- */
-static void
-set_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask)
-{
-    x = cursor_bitpos (flags, x, mask);
-    image += y * stride;
-    image[(x >> 3)] |= 1 << (x & 7);
-}
-    
-/*
- * Load a two color cursor into a driver that supports only ARGB cursors
- */
-static void
-xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)
-{
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    int			x, y;
-    int			xin, yin;
-    int			stride = cursor_info->MaxWidth >> 2;
-    int			flags = cursor_info->Flags;
-    CARD32		bits;
-
-#ifdef ARGB_CURSOR
-    crtc->cursor_argb = FALSE;
-#endif
-
-    for (y = 0; y < cursor_info->MaxHeight; y++)
-	for (x = 0; x < cursor_info->MaxWidth; x++) 
-	{
-	    xf86_crtc_rotate_coord (crtc->rotation,
-				    cursor_info->MaxWidth,
-				    cursor_info->MaxHeight,
-				    x, y, &xin, &yin);
-	    if (get_bit (src, stride, flags, xin, yin, TRUE) ==
-		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))
-	    {
-		if (get_bit (src, stride, flags, xin, yin, FALSE))
-		    bits = xf86_config->cursor_fg;
-		else
-		    bits = xf86_config->cursor_bg;
-	    }
-	    else
-		bits = 0;
-	    cursor_image[y * cursor_info->MaxWidth + x] = bits;
-	}
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
-}
-
-/*
- * Set the colors for a two-color cursor (ignore for ARGB cursors)
- */
-static void
-xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
-{
-    ScreenPtr		screen = scrn->pScreen;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    CursorPtr		cursor = xf86_config->cursor;
-    int			c;
-    CARD8		*bits = cursor ?
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
-        dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))
-#else
-        cursor->devPriv[screen->myNum]
-#endif
-      : NULL;
-
-    /* Save ARGB versions of these colors */
-    xf86_config->cursor_fg = (CARD32) fg | 0xff000000;
-    xf86_config->cursor_bg = (CARD32) bg | 0xff000000;
-    
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled && !crtc->cursor_argb)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		crtc->funcs->set_cursor_colors (crtc, bg, fg);
-	    else if (bits)
-		xf86_crtc_convert_cursor_to_argb (crtc, bits);
-	}
-    }
-}
-
-static void
-xf86_crtc_hide_cursor (xf86CrtcPtr crtc)
-{
-    if (crtc->cursor_shown)
-    {
-	crtc->funcs->hide_cursor (crtc);
-	crtc->cursor_shown = FALSE;
-    }
-}
-
-void
-xf86_hide_cursors (ScrnInfoPtr scrn)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    xf86_config->cursor_on = FALSE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	    xf86_crtc_hide_cursor (crtc);
-    }
-}
-    
-static void
-xf86_crtc_show_cursor (xf86CrtcPtr crtc)
-{
-    if (!crtc->cursor_shown && crtc->cursor_in_range)
-    {
-	crtc->funcs->show_cursor (crtc);
-	crtc->cursor_shown = TRUE;
-    }
-}
-
-void
-xf86_show_cursors (ScrnInfoPtr scrn)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    xf86_config->cursor_on = TRUE;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	    xf86_crtc_show_cursor (crtc);
-    }
-}
-    
-static void
-xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
-{
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    DisplayModePtr	mode = &crtc->mode;
-    Bool		in_range;
-    int			dx, dy;
-
-    /*
-     * Transform position of cursor on screen
-     */
-    if (crtc->transform_in_use)
-    {
-	ScreenPtr	screen = scrn->pScreen;
-	xf86CursorScreenPtr ScreenPriv =
-	    (xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,
-						  xf86CursorScreenKey);
-	struct pict_f_vector   v;
-
-	v.v[0] = x + ScreenPriv->HotX; v.v[1] = y + ScreenPriv->HotY; v.v[2] = 1;
-	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);
-	x = floor (v.v[0] + 0.5);
-	y = floor (v.v[1] + 0.5);
-	/*
-	 * Transform position of cursor upper left corner
-	 */
-	xf86_crtc_rotate_coord_back (crtc->rotation,
-				     cursor_info->MaxWidth,
-				     cursor_info->MaxHeight,
-				     ScreenPriv->HotX, ScreenPriv->HotY, &dx, &dy);
-	x -= dx;
-	y -= dy;
-   }
-    else
-    {
-	x -= crtc->x;
-	y -= crtc->y;
-    }
-
-    /*
-     * Disable the cursor when it is outside the viewport
-     */
-    in_range = TRUE;
-    if (x >= mode->HDisplay || y >= mode->VDisplay ||
-	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 
-    {
-	in_range = FALSE;
-	x = 0;
-	y = 0;
-    }
-
-    crtc->cursor_in_range = in_range;
-    
-    if (in_range)
-    {
-	crtc->funcs->set_cursor_position (crtc, x, y);
-	xf86_crtc_show_cursor (crtc);
-    }
-    else
-	xf86_crtc_hide_cursor (crtc);
-}
-
-static void
-xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    /* undo what xf86HWCurs did to the coordinates */
-    x += scrn->frameX0;
-    y += scrn->frameY0;
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	    xf86_crtc_set_cursor_position (crtc, x, y);
-    }
-}
-    
-/*
- * Load a two-color cursor into a crtc, performing rotation as needed
- */
-static void
-xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)
-{
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD8		*cursor_image;
-
-#ifdef ARGB_CURSOR
-    crtc->cursor_argb = FALSE;
-#endif
-
-    if (crtc->rotation == RR_Rotate_0)
-	cursor_image = src;
-    else
-    {
-        int x, y;
-    	int xin, yin;
-	int stride = cursor_info->MaxWidth >> 2;
-	int flags = cursor_info->Flags;
-	
-	cursor_image = xf86_config->cursor_image;
-	memset(cursor_image, 0, cursor_info->MaxHeight * stride);
-	
-        for (y = 0; y < cursor_info->MaxHeight; y++)
-	    for (x = 0; x < cursor_info->MaxWidth; x++) 
-	    {
-		xf86_crtc_rotate_coord (crtc->rotation,
-					cursor_info->MaxWidth,
-					cursor_info->MaxHeight,
-					x, y, &xin, &yin);
-		if (get_bit(src, stride, flags, xin, yin, FALSE))
-		    set_bit(cursor_image, stride, flags, x, y, FALSE);
-		if (get_bit(src, stride, flags, xin, yin, TRUE))
-		    set_bit(cursor_image, stride, flags, x, y, TRUE);
-	    }
-    }
-    crtc->funcs->load_cursor_image (crtc, cursor_image);
-}
-    
-/*
- * Load a cursor image into all active CRTCs
- */
-static void
-xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	{
-	    if (crtc->funcs->load_cursor_image)
-		xf86_crtc_load_cursor_image (crtc, src);
-	    else if (crtc->funcs->load_cursor_argb)
-		xf86_crtc_convert_cursor_to_argb (crtc, src);
-	}
-    }
-}
-
-static Bool
-xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
-{
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-
-    ++cursor->refcnt;
-    if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
-    xf86_config->cursor = cursor;
-
-    if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
-
-    return TRUE;
-}
-
-static Bool
-xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
-{
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    
-    ++cursor->refcnt;
-    if (xf86_config->cursor)
-	FreeCursor (xf86_config->cursor, None);
-    xf86_config->cursor = cursor;
-    
-    /* Make sure ARGB support is available */
-    if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
-	return FALSE;
-    
-    if (cursor->bits->width > cursor_info->MaxWidth ||
-	cursor->bits->height> cursor_info->MaxHeight)
-	return FALSE;
-
-    return TRUE;
-}
-
-static void
-xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)
-{
-    ScrnInfoPtr		scrn = crtc->scrn;
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
-    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;
-    int			x, y;
-    int			xin, yin;
-    CARD32		bits;
-    int			source_width = cursor->bits->width;
-    int			source_height = cursor->bits->height;
-    int			image_width = cursor_info->MaxWidth;
-    int			image_height = cursor_info->MaxHeight;
-    
-    for (y = 0; y < image_height; y++)
-	for (x = 0; x < image_width; x++)
-	{
-	    xf86_crtc_rotate_coord (crtc->rotation, image_width, image_height,
-				    x, y, &xin, &yin);
-	    if (xin < source_width && yin < source_height)
-		bits = cursor_source[yin * source_width + xin];
-	    else
-		bits = 0;
-	    cursor_image[y * image_width + x] = bits;
-	}
-    
-    crtc->funcs->load_cursor_argb (crtc, cursor_image);
-}
-
-static void
-xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)
-{
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    int			c;
-
-    for (c = 0; c < xf86_config->num_crtc; c++)
-    {
-	xf86CrtcPtr crtc = xf86_config->crtc[c];
-
-	if (crtc->enabled)
-	    xf86_crtc_load_cursor_argb (crtc, cursor);
-    }
-}
-
-Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
-{
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    xf86CursorInfoPtr	cursor_info;
-
-    cursor_info = xf86CreateCursorInfoRec();
-    if (!cursor_info)
-	return FALSE;
-
-    xf86_config->cursor_image = xalloc (max_width * max_height * 4);
-
-    if (!xf86_config->cursor_image)
-    {
-	xf86DestroyCursorInfoRec (cursor_info);
-	return FALSE;
-    }
-	
-    xf86_config->cursor_info = cursor_info;
-
-    cursor_info->MaxWidth = max_width;
-    cursor_info->MaxHeight = max_height;
-    cursor_info->Flags = flags;
-
-    cursor_info->SetCursorColors = xf86_set_cursor_colors;
-    cursor_info->SetCursorPosition = xf86_set_cursor_position;
-    cursor_info->LoadCursorImage = xf86_load_cursor_image;
-    cursor_info->HideCursor = xf86_hide_cursors;
-    cursor_info->ShowCursor = xf86_show_cursors;
-    cursor_info->UseHWCursor = xf86_use_hw_cursor;
-#ifdef ARGB_CURSOR
-    if (flags & HARDWARE_CURSOR_ARGB)
-    {
-	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
-	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
-    }
-#endif
-    
-    xf86_config->cursor = NULL;
-    xf86_hide_cursors (scrn);
-    
-    return xf86InitCursor (screen, cursor_info);
-}
-
-/**
- * Called when anything on the screen is reconfigured.
- *
- * Reloads cursor images as needed, then adjusts cursor positions
- */
-
-void
-xf86_reload_cursors (ScreenPtr screen)
-{
-    ScrnInfoPtr		scrn;
-    xf86CrtcConfigPtr   xf86_config;
-    xf86CursorInfoPtr   cursor_info;
-    CursorPtr		cursor;
-    int			x, y;
-    xf86CursorScreenPtr cursor_screen_priv;
-    
-    /* initial mode setting will not have set a screen yet.
-       May be called before the devices are initialised.
-     */
-    if (!screen || !inputInfo.pointer)
-	return;
-    cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
-					  xf86CursorScreenKey);
-    /* return if HW cursor is inactive, to avoid displaying two cursors */
-    if (!cursor_screen_priv->isUp)
-	return;
-
-    scrn = xf86Screens[screen->myNum];
-    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-
-    /* make sure the cursor code has been initialized */
-    cursor_info = xf86_config->cursor_info;
-    if (!cursor_info)
-	return;
-
-    cursor = xf86_config->cursor;
-    GetSpritePosition (inputInfo.pointer, &x, &y);
-    if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
-	(*cursor_info->HideCursor)(scrn);
-
-    if (cursor)
-    {
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
-	void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen));
-#else
-	void *src = cursor->devPriv[screen->myNum];
-#endif
-#ifdef ARGB_CURSOR
-	if (cursor->bits->argb && cursor_info->LoadCursorARGB)
-	    (*cursor_info->LoadCursorARGB) (scrn, cursor);
-	else if (src)
-#endif
-	    (*cursor_info->LoadCursorImage)(scrn, src);
-
-	x += scrn->frameX0 + cursor_screen_priv->HotX;
-	y += scrn->frameY0 + cursor_screen_priv->HotY;
-	(*cursor_info->SetCursorPosition)(scrn, x, y);
-    }
-}
-
-/**
- * Clean up CRTC-based cursor code
- */
-void
-xf86_cursors_fini (ScreenPtr screen)
-{
-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-    
-    if (xf86_config->cursor_info)
-    {
-	xf86DestroyCursorInfoRec (xf86_config->cursor_info);
-	xf86_config->cursor_info = NULL;
-    }
-    if (xf86_config->cursor_image)
-    {
-	xfree (xf86_config->cursor_image);
-	xf86_config->cursor_image = NULL;
-    }
-    if (xf86_config->cursor)
-    {
-	FreeCursor (xf86_config->cursor, None);
-	xf86_config->cursor = NULL;
-    }
-}
+/*

+ * Copyright © 2007 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#else

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#endif

+

+#include <stddef.h>

+#include <string.h>

+#include <stdio.h>

+

+#include "xf86.h"

+#include "xf86DDC.h"

+#include "xf86Crtc.h"

+#include "xf86Modes.h"

+#include "xf86RandR12.h"

+#include "xf86CursorPriv.h"

+#include "X11/extensions/render.h"

+#include "X11/extensions/dpmsconst.h"

+#include "X11/Xatom.h"

+#include "picturestr.h"

+#include "cursorstr.h"

+#include "inputstr.h"

+

+/*

+ * Given a screen coordinate, rotate back to a cursor source coordinate

+ */

+static void

+xf86_crtc_rotate_coord (Rotation    rotation,

+			int	    width,

+			int	    height,

+			int	    x_dst,

+			int	    y_dst,

+			int	    *x_src,

+			int	    *y_src)

+{

+    int t;

+    

+    switch (rotation & 0xf) {

+    case RR_Rotate_0:

+	break;

+    case RR_Rotate_90:

+	t = x_dst;

+	x_dst = height - y_dst - 1;

+	y_dst = t;

+	break;

+    case RR_Rotate_180:

+	x_dst = width - x_dst - 1;

+	y_dst = height - y_dst - 1;

+	break;

+    case RR_Rotate_270:

+	t = x_dst;

+	x_dst = y_dst;

+	y_dst = width - t - 1;

+	break;

+    }

+    if (rotation & RR_Reflect_X)

+	x_dst = width - x_dst - 1;

+    if (rotation & RR_Reflect_Y)

+	y_dst = height - y_dst - 1;

+    *x_src = x_dst;

+    *y_src = y_dst;

+}

+

+/*

+ * Given a cursor source  coordinate, rotate to a screen coordinate

+ */

+static void

+xf86_crtc_rotate_coord_back (Rotation    rotation,

+			     int	    width,

+			     int	    height,

+			     int	    x_dst,

+			     int	    y_dst,

+			     int	    *x_src,

+			     int	    *y_src)

+{

+    int t;

+    

+    if (rotation & RR_Reflect_X)

+	x_dst = width - x_dst - 1;

+    if (rotation & RR_Reflect_Y)

+	y_dst = height - y_dst - 1;

+

+    switch (rotation & 0xf) {

+    case RR_Rotate_0:

+	break;

+    case RR_Rotate_90:

+	t = x_dst;

+	x_dst = y_dst;

+	y_dst = width - t - 1;

+	break;

+    case RR_Rotate_180:

+	x_dst = width - x_dst - 1;

+	y_dst = height - y_dst - 1;

+	break;

+    case RR_Rotate_270:

+	t = x_dst;

+	x_dst = height - y_dst - 1;

+	y_dst = t;

+	break;

+    }

+    *x_src = x_dst;

+    *y_src = y_dst;

+}

+

+/*

+ * Convert an x coordinate to a position within the cursor bitmap

+ */

+static int

+cursor_bitpos (int flags, int x, Bool mask)

+{

+    if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)

+	mask = !mask;

+    if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)

+	x = (x & ~3) | (3 - (x & 3));

+    if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==

+	(X_BYTE_ORDER == X_BIG_ENDIAN))

+	x = (x & ~7) | (7 - (x & 7));

+    if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)

+	x = (x << 1) + mask;

+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)

+	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);

+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)

+	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);

+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)

+	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);

+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)

+	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);

+    return x;

+}

+

+/*

+ * Fetch one bit from a cursor bitmap

+ */

+static CARD8

+get_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask)

+{

+    x = cursor_bitpos (flags, x, mask);

+    image += y * stride;

+    return (image[(x >> 3)] >> (x & 7)) & 1;

+}

+

+/*

+ * Set one bit in a cursor bitmap

+ */

+static void

+set_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask)

+{

+    x = cursor_bitpos (flags, x, mask);

+    image += y * stride;

+    image[(x >> 3)] |= 1 << (x & 7);

+}

+    

+/*

+ * Load a two color cursor into a driver that supports only ARGB cursors

+ */

+static void

+xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)

+{

+    ScrnInfoPtr		scrn = crtc->scrn;

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;

+    int			x, y;

+    int			xin, yin;

+    int			stride = cursor_info->MaxWidth >> 2;

+    int			flags = cursor_info->Flags;

+    CARD32		bits;

+

+#ifdef ARGB_CURSOR

+    crtc->cursor_argb = FALSE;

+#endif

+

+    for (y = 0; y < cursor_info->MaxHeight; y++)

+	for (x = 0; x < cursor_info->MaxWidth; x++) 

+	{

+	    xf86_crtc_rotate_coord (crtc->rotation,

+				    cursor_info->MaxWidth,

+				    cursor_info->MaxHeight,

+				    x, y, &xin, &yin);

+	    if (get_bit (src, stride, flags, xin, yin, TRUE) ==

+		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))

+	    {

+		if (get_bit (src, stride, flags, xin, yin, FALSE))

+		    bits = xf86_config->cursor_fg;

+		else

+		    bits = xf86_config->cursor_bg;

+	    }

+	    else

+		bits = 0;

+	    cursor_image[y * cursor_info->MaxWidth + x] = bits;

+	}

+    crtc->funcs->load_cursor_argb (crtc, cursor_image);

+}

+

+/*

+ * Set the colors for a two-color cursor (ignore for ARGB cursors)

+ */

+static void

+xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)

+{

+    ScreenPtr		screen = scrn->pScreen;

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    CursorPtr		cursor = xf86_config->cursor;

+    int			c;

+    CARD8		*bits = cursor ?

+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

+        dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))

+#else

+        cursor->devPriv[screen->myNum]

+#endif

+      : NULL;

+

+    /* Save ARGB versions of these colors */

+    xf86_config->cursor_fg = (CARD32) fg | 0xff000000;

+    xf86_config->cursor_bg = (CARD32) bg | 0xff000000;

+    

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled && !crtc->cursor_argb)

+	{

+	    if (crtc->funcs->load_cursor_image)

+		crtc->funcs->set_cursor_colors (crtc, bg, fg);

+	    else if (bits)

+		xf86_crtc_convert_cursor_to_argb (crtc, bits);

+	}

+    }

+}

+

+static void

+xf86_crtc_hide_cursor (xf86CrtcPtr crtc)

+{

+    if (crtc->cursor_shown)

+    {

+	crtc->funcs->hide_cursor (crtc);

+	crtc->cursor_shown = FALSE;

+    }

+}

+

+void

+xf86_hide_cursors (ScrnInfoPtr scrn)

+{

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			c;

+

+    xf86_config->cursor_on = FALSE;

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled)

+	    xf86_crtc_hide_cursor (crtc);

+    }

+}

+    

+static void

+xf86_crtc_show_cursor (xf86CrtcPtr crtc)

+{

+    if (!crtc->cursor_shown && crtc->cursor_in_range)

+    {

+	crtc->funcs->show_cursor (crtc);

+	crtc->cursor_shown = TRUE;

+    }

+}

+

+void

+xf86_show_cursors (ScrnInfoPtr scrn)

+{

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			c;

+

+    xf86_config->cursor_on = TRUE;

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled)

+	    xf86_crtc_show_cursor (crtc);

+    }

+}

+    

+static void

+xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)

+{

+    ScrnInfoPtr		scrn = crtc->scrn;

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+    DisplayModePtr	mode = &crtc->mode;

+    Bool		in_range;

+    int			dx, dy;

+

+    /*

+     * Transform position of cursor on screen

+     */

+    if (crtc->transform_in_use)

+    {

+	ScreenPtr	screen = scrn->pScreen;

+	xf86CursorScreenPtr ScreenPriv =

+	    (xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,

+						  xf86CursorScreenKey);

+	struct pict_f_vector   v;

+

+	v.v[0] = x + ScreenPriv->HotX; v.v[1] = y + ScreenPriv->HotY; v.v[2] = 1;

+	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);

+	x = floor (v.v[0] + 0.5);

+	y = floor (v.v[1] + 0.5);

+	/*

+	 * Transform position of cursor upper left corner

+	 */

+	xf86_crtc_rotate_coord_back (crtc->rotation,

+				     cursor_info->MaxWidth,

+				     cursor_info->MaxHeight,

+				     ScreenPriv->HotX, ScreenPriv->HotY, &dx, &dy);

+	x -= dx;

+	y -= dy;

+   }

+    else

+    {

+	x -= crtc->x;

+	y -= crtc->y;

+    }

+

+    /*

+     * Disable the cursor when it is outside the viewport

+     */

+    in_range = TRUE;

+    if (x >= mode->HDisplay || y >= mode->VDisplay ||

+	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 

+    {

+	in_range = FALSE;

+	x = 0;

+	y = 0;

+    }

+

+    crtc->cursor_in_range = in_range;

+    

+    if (in_range)

+    {

+	crtc->funcs->set_cursor_position (crtc, x, y);

+	xf86_crtc_show_cursor (crtc);

+    }

+    else

+	xf86_crtc_hide_cursor (crtc);

+}

+

+static void

+xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)

+{

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			c;

+

+    /* undo what xf86HWCurs did to the coordinates */

+    x += scrn->frameX0;

+    y += scrn->frameY0;

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled)

+	    xf86_crtc_set_cursor_position (crtc, x, y);

+    }

+}

+    

+/*

+ * Load a two-color cursor into a crtc, performing rotation as needed

+ */

+static void

+xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)

+{

+    ScrnInfoPtr		scrn = crtc->scrn;

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+    CARD8		*cursor_image;

+

+#ifdef ARGB_CURSOR

+    crtc->cursor_argb = FALSE;

+#endif

+

+    if (crtc->rotation == RR_Rotate_0)

+	cursor_image = src;

+    else

+    {

+        int x, y;

+    	int xin, yin;

+	int stride = cursor_info->MaxWidth >> 2;

+	int flags = cursor_info->Flags;

+	

+	cursor_image = xf86_config->cursor_image;

+	memset(cursor_image, 0, cursor_info->MaxHeight * stride);

+	

+        for (y = 0; y < cursor_info->MaxHeight; y++)

+	    for (x = 0; x < cursor_info->MaxWidth; x++) 

+	    {

+		xf86_crtc_rotate_coord (crtc->rotation,

+					cursor_info->MaxWidth,

+					cursor_info->MaxHeight,

+					x, y, &xin, &yin);

+		if (get_bit(src, stride, flags, xin, yin, FALSE))

+		    set_bit(cursor_image, stride, flags, x, y, FALSE);

+		if (get_bit(src, stride, flags, xin, yin, TRUE))

+		    set_bit(cursor_image, stride, flags, x, y, TRUE);

+	    }

+    }

+    crtc->funcs->load_cursor_image (crtc, cursor_image);

+}

+    

+/*

+ * Load a cursor image into all active CRTCs

+ */

+static void

+xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)

+{

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			c;

+

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled)

+	{

+	    if (crtc->funcs->load_cursor_image)

+		xf86_crtc_load_cursor_image (crtc, src);

+	    else if (crtc->funcs->load_cursor_argb)

+		xf86_crtc_convert_cursor_to_argb (crtc, src);

+	}

+    }

+}

+

+static Bool

+xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+

+    ++cursor->refcnt;

+    if (xf86_config->cursor)

+	FreeCursor (xf86_config->cursor, None);

+    xf86_config->cursor = cursor;

+

+    if (cursor->bits->width > cursor_info->MaxWidth ||

+	cursor->bits->height> cursor_info->MaxHeight)

+	return FALSE;

+

+    return TRUE;

+}

+

+static Bool

+xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+    

+    ++cursor->refcnt;

+    if (xf86_config->cursor)

+	FreeCursor (xf86_config->cursor, None);

+    xf86_config->cursor = cursor;

+    

+    /* Make sure ARGB support is available */

+    if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)

+	return FALSE;

+    

+    if (cursor->bits->width > cursor_info->MaxWidth ||

+	cursor->bits->height> cursor_info->MaxHeight)

+	return FALSE;

+

+    return TRUE;

+}

+

+static void

+xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)

+{

+    ScrnInfoPtr		scrn = crtc->scrn;

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

+    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;

+    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;

+    int			x, y;

+    int			xin, yin;

+    CARD32		bits;

+    int			source_width = cursor->bits->width;

+    int			source_height = cursor->bits->height;

+    int			image_width = cursor_info->MaxWidth;

+    int			image_height = cursor_info->MaxHeight;

+    

+    for (y = 0; y < image_height; y++)

+	for (x = 0; x < image_width; x++)

+	{

+	    xf86_crtc_rotate_coord (crtc->rotation, image_width, image_height,

+				    x, y, &xin, &yin);

+	    if (xin < source_width && yin < source_height)

+		bits = cursor_source[yin * source_width + xin];

+	    else

+		bits = 0;

+	    cursor_image[y * image_width + x] = bits;

+	}

+    

+    crtc->funcs->load_cursor_argb (crtc, cursor_image);

+}

+

+static void

+xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)

+{

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			c;

+

+    for (c = 0; c < xf86_config->num_crtc; c++)

+    {

+	xf86CrtcPtr crtc = xf86_config->crtc[c];

+

+	if (crtc->enabled)

+	    xf86_crtc_load_cursor_argb (crtc, cursor);

+    }

+}

+

+Bool

+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    xf86CursorInfoPtr	cursor_info;

+

+    cursor_info = xf86CreateCursorInfoRec();

+    if (!cursor_info)

+	return FALSE;

+

+    xf86_config->cursor_image = xalloc (max_width * max_height * 4);

+

+    if (!xf86_config->cursor_image)

+    {

+	xf86DestroyCursorInfoRec (cursor_info);

+	return FALSE;

+    }

+	

+    xf86_config->cursor_info = cursor_info;

+

+    cursor_info->MaxWidth = max_width;

+    cursor_info->MaxHeight = max_height;

+    cursor_info->Flags = flags;

+

+    cursor_info->SetCursorColors = xf86_set_cursor_colors;

+    cursor_info->SetCursorPosition = xf86_set_cursor_position;

+    cursor_info->LoadCursorImage = xf86_load_cursor_image;

+    cursor_info->HideCursor = xf86_hide_cursors;

+    cursor_info->ShowCursor = xf86_show_cursors;

+    cursor_info->UseHWCursor = xf86_use_hw_cursor;

+#ifdef ARGB_CURSOR

+    if (flags & HARDWARE_CURSOR_ARGB)

+    {

+	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;

+	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;

+    }

+#endif

+    

+    xf86_config->cursor = NULL;

+    xf86_hide_cursors (scrn);

+    

+    return xf86InitCursor (screen, cursor_info);

+}

+

+/**

+ * Called when anything on the screen is reconfigured.

+ *

+ * Reloads cursor images as needed, then adjusts cursor positions

+ */

+

+void

+xf86_reload_cursors (ScreenPtr screen)

+{

+    ScrnInfoPtr		scrn;

+    xf86CrtcConfigPtr   xf86_config;

+    xf86CursorInfoPtr   cursor_info;

+    CursorPtr		cursor;

+    int			x, y;

+    xf86CursorScreenPtr cursor_screen_priv;

+    

+    /* initial mode setting will not have set a screen yet.

+       May be called before the devices are initialised.

+     */

+    if (!screen || !inputInfo.pointer)

+	return;

+    cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,

+					  xf86CursorScreenKey);

+    /* return if HW cursor is inactive, to avoid displaying two cursors */

+    if (!cursor_screen_priv || !cursor_screen_priv->isUp)

+	return;

+

+    scrn = xf86Screens[screen->myNum];

+    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    /* make sure the cursor code has been initialized */

+    cursor_info = xf86_config->cursor_info;

+    if (!cursor_info)

+	return;

+

+    cursor = xf86_config->cursor;

+    GetSpritePosition (inputInfo.pointer, &x, &y);

+    if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))

+	(*cursor_info->HideCursor)(scrn);

+

+    if (cursor)

+    {

+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

+	void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen));

+#else

+	void *src = cursor->devPriv[screen->myNum];

+#endif

+#ifdef ARGB_CURSOR

+	if (cursor->bits->argb && cursor_info->LoadCursorARGB)

+	    (*cursor_info->LoadCursorARGB) (scrn, cursor);

+	else if (src)

+#endif

+	    (*cursor_info->LoadCursorImage)(scrn, src);

+

+	x += scrn->frameX0 + cursor_screen_priv->HotX;

+	y += scrn->frameY0 + cursor_screen_priv->HotY;

+	(*cursor_info->SetCursorPosition)(scrn, x, y);

+    }

+}

+

+/**

+ * Clean up CRTC-based cursor code

+ */

+void

+xf86_cursors_fini (ScreenPtr screen)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

+    

+    if (xf86_config->cursor_info)

+    {

+	xf86DestroyCursorInfoRec (xf86_config->cursor_info);

+	xf86_config->cursor_info = NULL;

+    }

+    if (xf86_config->cursor_image)

+    {

+	xfree (xf86_config->cursor_image);

+	xf86_config->cursor_image = NULL;

+    }

+    if (xf86_config->cursor)

+    {

+	FreeCursor (xf86_config->cursor, None);

+	xf86_config->cursor = NULL;

+    }

+}

diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index ad9ebbdac..e56dac1a1 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -1,1639 +1,1641 @@
-/*
- * GLX implementation that uses Apple's OpenGL.framework
- * (Indirect rendering path -- it's also used for some direct mode code too)
- *
- * Copyright (c) 2007, 2008, 2009 Apple Inc.
- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Greg Parker. All Rights Reserved.
- *
- * Portions of this file are copied from Mesa's xf86glx.c,
- * which contains the following copyright:
- *
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "dri.h"
-
-#include <AvailabilityMacros.h>
-
-#define GL_GLEXT_WUNDEF_SUPPORT
-
-#include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-#include <OpenGL/CGLContext.h>
-
-/* These next few GL_EXT pre-processing blocks are to explicitly define 
- * these symbols to 0 if they are not set by OpenGL.framework.  This
- * prevents the X11 glext.h from setting them to 1.
- */
-
-#ifndef GL_EXT_fragment_shader
-#define GL_EXT_fragment_shader 0
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 0
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 0
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 0
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 0
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 0
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 0
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 0
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 0
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 0
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 0
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 0
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 0
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 0
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 0
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 0
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 0
-#endif
-
-/* Tiger PPC doesn't have the associated symbols, but glext.h says it does.  Liars!
- * http://trac.macports.org/ticket/20638
- */
-#if defined(__ppc__) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-#undef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 0
-#endif
-
-#include <GL/glxproto.h>
-#include <windowstr.h>
-#include <resource.h>
-#include <GL/glxint.h>
-#include <GL/glxtokens.h>
-#include <scrnintstr.h>
-#include <glxserver.h>
-#include <glxscreens.h>
-#include <glxdrawable.h>
-#include <glxcontext.h>
-#include <glxext.h>
-#include <glxutil.h>
-#include <glxscreens.h>
-#include <GL/internal/glcore.h>
-#include "x-hash.h"
-#include "x-list.h"
-
-//#include "capabilities.h"
-#include "visualConfigs.h"
-
-typedef unsigned long long GLuint64EXT;
-typedef long long GLint64EXT;
-#include <dispatch.h>
-#include <Xplugin.h>
-#include <glapi.h>
-#include <glapitable.h>
-
-__GLXprovider * GlxGetDRISWrastProvider (void);
-
-// Write debugging output, or not
-#ifdef GLAQUA_DEBUG
-#define GLAQUA_DEBUG_MSG ErrorF
-#else
-#define GLAQUA_DEBUG_MSG(a, ...)
-#endif
-
-static void setup_dispatch_table(void);
-GLuint __glFloorLog2(GLuint val);
-void warn_func(void * p1, char *format, ...);
-
-// some prototypes
-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);
-static __GLXdrawable * __glXAquaScreenCreateDrawable(__GLXscreen *screen, DrawablePtr pDraw, int type, XID drawId, __GLXconfig *conf);
-
-static void __glXAquaContextDestroy(__GLXcontext *baseContext);
-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);
-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);
-static int __glXAquaContextForceCurrent(__GLXcontext *baseContext);
-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);
-
-static CGLPixelFormatObj makeFormat(__GLXconfig *conf);
-
-__GLXprovider __glXDRISWRastProvider = {
-    __glXAquaScreenProbe,
-    "Core OpenGL",
-    NULL
-};
-
-typedef struct __GLXAquaScreen   __GLXAquaScreen;
-typedef struct __GLXAquaContext  __GLXAquaContext;
-typedef struct __GLXAquaDrawable __GLXAquaDrawable;
-
-struct __GLXAquaScreen {
-    __GLXscreen base;
-    int index;
-    int num_vis;
-};
-
-struct __GLXAquaContext {
-    __GLXcontext base;
-    CGLContextObj ctx;
-    CGLPixelFormatObj pixelFormat;
-    xp_surface_id sid;
-    unsigned isAttached :1;
-};
-
-struct __GLXAquaDrawable {
-    __GLXdrawable base;
-    DrawablePtr pDraw;
-    xp_surface_id sid;
-    __GLXAquaContext *context;
-};
-
-
-static __GLXcontext *
-__glXAquaScreenCreateContext(__GLXscreen *screen,
-			     __GLXconfig *conf,
-			     __GLXcontext *baseShareContext)
-{
-    __GLXAquaContext *context;
-    __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;
-    CGLError gl_err;
-  
-    GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");
-    
-    context = xcalloc(1, sizeof (__GLXAquaContext));
-    
-    if (context == NULL)
-	return NULL;
-
-    memset(context, 0, sizeof *context);
-    
-    context->base.pGlxScreen = screen;
-    
-    context->base.destroy        = __glXAquaContextDestroy;
-    context->base.makeCurrent    = __glXAquaContextMakeCurrent;
-    context->base.loseCurrent    = __glXAquaContextLoseCurrent;
-    context->base.copy           = __glXAquaContextCopy;
-    context->base.forceCurrent   = __glXAquaContextForceCurrent;
-    /*FIXME verify that the context->base is fully initialized. */
-    
-    context->pixelFormat = makeFormat(conf);
-    
-    if (!context->pixelFormat) {
-        xfree(context);
-        return NULL;
-    }
-
-    context->ctx = NULL;
-    gl_err = CGLCreateContext(context->pixelFormat,
-			      shareContext ? shareContext->ctx : NULL,
-			      &context->ctx);
-    
-    if (gl_err != 0) {
-	ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));
-	CGLDestroyPixelFormat(context->pixelFormat);
-	xfree(context);
-	return NULL;
-    }
-    
-    setup_dispatch_table();
-    GLAQUA_DEBUG_MSG("glAquaCreateContext done\n");
-    
-    return &context->base;
-}
-
-/* maps from surface id -> list of __GLcontext */
-static x_hash_table *surface_hash;
-
-static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
-    x_list *lst;
-
-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-    
-    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n",
-                     (unsigned int) baseContext);
-    if (context != NULL) {
-      if (context->sid != 0 && surface_hash != NULL) {
-		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
-		lst = x_list_remove(lst, context);
-		x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
-      }
-
-      if (context->ctx != NULL)
-	  CGLDestroyContext(context->ctx);
-
-      if (context->pixelFormat != NULL)
-	  CGLDestroyPixelFormat(context->pixelFormat);
-      
-      xfree(context);
-    }
-}
-
-static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {
-    CGLError gl_err;
-
-    GLAQUA_DEBUG_MSG("glAquaLoseCurrent (ctx 0x%p)\n", baseContext);
-
-    gl_err = CGLSetCurrentContext(NULL);
-    if (gl_err != 0)
-      ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
-
-    __glXLastContext = NULL; // Mesa does this; why?
-
-    return GL_TRUE;
-}
-
-/* Called when a surface is destroyed as a side effect of destroying
-   the window it's attached to. */
-static void surface_notify(void *_arg, void *data) {
-    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;
-    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;
-    __GLXAquaContext *context;
-    x_list *lst;
-    if(_arg == NULL || data == NULL) {
-	    ErrorF("surface_notify called with bad params");
-	    return;
-    }
-	
-    GLAQUA_DEBUG_MSG("surface_notify(%p, %p)\n", _arg, data);
-    switch (arg->kind) {
-    case AppleDRISurfaceNotifyDestroyed:
-        if (surface_hash != NULL)
-            x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
-	draw->base.pDraw = NULL;
-	draw->sid = 0;
-        break;
-
-    case AppleDRISurfaceNotifyChanged:
-        if (surface_hash != NULL) {
-            lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id), NULL);
-            for (; lst != NULL; lst = lst->next)
-		{
-                context = lst->data;
-                xp_update_gl_context(context->ctx);
-            }
-        }
-        break;
-    default:
-	ErrorF("surface_notify: unknown kind %d\n", arg->kind);
-	break;
-    }
-}
-
-static BOOL attach(__GLXAquaContext *context, __GLXAquaDrawable *draw) {
-    DrawablePtr pDraw;
-    
-    GLAQUA_DEBUG_MSG("attach(%p, %p)\n", context, draw);
-	
-    if(NULL == context || NULL == draw)
-	return TRUE;
-
-    pDraw = draw->base.pDraw;
-
-    if(NULL == pDraw) {
-	ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);
-	return TRUE;
-    }
-
-    if (draw->sid == 0) {
-	//if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,
-        if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,
-			      0, &draw->sid, NULL,
-			      surface_notify, draw))
-            return TRUE;
-        draw->pDraw = pDraw;
-    } 
-    
-    if (!context->isAttached || context->sid != draw->sid) {
-        x_list *lst;
-	
-        if (xp_attach_gl_context(context->ctx, draw->sid) != Success) {
-	    //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,
-            DRIDestroySurface(pDraw->pScreen, pDraw->id, pDraw,
-			      surface_notify, draw);
-            if (surface_hash != NULL)
-                x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(draw->sid));
-	    
-            draw->sid = 0;
-            return TRUE;
-        }
-	
-        context->isAttached = TRUE;
-        context->sid = draw->sid;
-	
-        if (surface_hash == NULL)
-            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
-	
-        lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
-        if (x_list_find(lst, context) == NULL) {
-            lst = x_list_prepend(lst, context);
-            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);
-        }
-	
-	
-
-        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,
-                         (unsigned int) draw->sid);
-    } 
-
-    draw->context = context;
-
-    return FALSE;
-}
-
-#if 0     // unused
-static void unattach(__GLXAquaContext *context) {
-	x_list *lst;
-	GLAQUA_DEBUG_MSG("unattach\n");
-	if (context == NULL) {
-		ErrorF("Tried to unattach a null context\n");
-		return;
-	}
-    if (context->isAttached) {
-        GLAQUA_DEBUG_MSG("unattaching\n");
-
-        if (surface_hash != NULL) {
-            lst = x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);
-            lst = x_list_remove(lst, context);
-            x_hash_table_insert(surface_hash, (void *) context->sid, lst);
-        }
-
-        CGLClearDrawable(context->ctx);
-        context->isAttached = FALSE;
-        context->sid = 0;
-    }
-}
-#endif
-
-static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext) {
-    CGLError gl_err;
-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;
-    
-    GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);
-    
-    if(attach(context, drawPriv))
-	return /*error*/ 0;
-
-    gl_err = CGLSetCurrentContext(context->ctx);
-    if (gl_err != 0)
-        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
-    
-    return gl_err == 0;
-}
-
-static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask)
-{
-    CGLError gl_err;
-
-    __GLXAquaContext *dst = (__GLXAquaContext *) baseDst;
-    __GLXAquaContext *src = (__GLXAquaContext *) baseSrc;
-
-    GLAQUA_DEBUG_MSG("GLXAquaContextCopy\n");
-
-    gl_err = CGLCopyContext(src->ctx, dst->ctx, mask);
-    if (gl_err != 0)
-        ErrorF("CGLCopyContext error: %s\n", CGLErrorString(gl_err));
-
-    return gl_err == 0;
-}
-
-static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)
-{
-    CGLError gl_err;
-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-    GLAQUA_DEBUG_MSG("glAquaForceCurrent (ctx %p)\n", context->ctx);
-
-    gl_err = CGLSetCurrentContext(context->ctx);
-    if (gl_err != 0)
-        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));
-
-    return gl_err == 0;
-}
-
-/* Drawing surface notification callbacks */
-static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {
-    CGLError err;
-    __GLXAquaDrawable *drawable;
- 
-    //    GLAQUA_DEBUG_MSG("glAquaDrawableSwapBuffers(%p)\n",base);
-	
-    if(!base) {
-	ErrorF("%s passed NULL\n", __func__);
-	return GL_FALSE;
-    }
-
-    drawable = (__GLXAquaDrawable *)base;
-
-    if(NULL == drawable->context) {
-	ErrorF("%s called with a NULL->context for drawable %p!\n",
-	       __func__, (void *)drawable);
-	return GL_FALSE;
-    }
-
-    err = CGLFlushDrawable(drawable->context->ctx);
-
-    if(kCGLNoError != err) {
-	ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),
-	       __func__);
-	return GL_FALSE;
-    }
-
-    return GL_TRUE;
-}
-
-
-static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
-    CGLPixelFormatAttribute attr[64];
-    CGLPixelFormatObj fobj;
-    GLint formats;
-    CGLError error;
-    int i = 0;
-    
-    if(conf->doubleBufferMode)
-	attr[i++] = kCGLPFADoubleBuffer;
-
-    if(conf->stereoMode)
-	attr[i++] = kCGLPFAStereo;
-
-    attr[i++] = kCGLPFAColorSize;
-    attr[i++] = conf->redBits + conf->greenBits + conf->blueBits;
-    attr[i++] = kCGLPFAAlphaSize;
-    attr[i++] = conf->alphaBits;
-
-    if((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +
-	conf->accumAlphaBits) > 0) {
-
-	attr[i++] = kCGLPFAAccumSize;
-        attr[i++] = conf->accumRedBits + conf->accumGreenBits
-	    + conf->accumBlueBits + conf->accumAlphaBits;
-    }
-    
-    attr[i++] = kCGLPFADepthSize;
-    attr[i++] = conf->depthBits;
-
-    if(conf->stencilBits) {
-	attr[i++] = kCGLPFAStencilSize;
-        attr[i++] = conf->stencilBits;	
-    }
-    
-    if(conf->numAuxBuffers > 0) {
-	attr[i++] = kCGLPFAAuxBuffers;
-	attr[i++] = conf->numAuxBuffers;
-    }
-
-    if(conf->sampleBuffers > 0) {
-       attr[i++] = kCGLPFASampleBuffers;
-       attr[i++] = conf->sampleBuffers;
-       attr[i++] = kCGLPFASamples;
-       attr[i++] = conf->samples;
-    }
-     
-    attr[i] = 0;
-
-    error = CGLChoosePixelFormat(attr, &fobj, &formats);
-    if(error) {
-	ErrorF("error: creating pixel format %s\n", CGLErrorString(error));
-	return NULL;
-    }
-
-    return fobj;
-}
-
-static void __glXAquaScreenDestroy(__GLXscreen *screen) {
-
-    GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);
-    __glXScreenDestroy(screen);
-
-    xfree(screen);
-}
-
-/* This is called by __glXInitScreens(). */
-static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
-    __GLXAquaScreen *screen;
-
-    GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");
-
-    if (pScreen == NULL) 
-	return NULL;
-
-    screen = xcalloc(1, sizeof *screen);
-
-    if(NULL == screen)
-	return NULL;
-    
-    screen->base.destroy        = __glXAquaScreenDestroy;
-    screen->base.createContext  = __glXAquaScreenCreateContext;
-    screen->base.createDrawable = __glXAquaScreenCreateDrawable;
-    screen->base.swapInterval = /*FIXME*/ NULL;
-    screen->base.hyperpipeFuncs = NULL;
-    screen->base.swapBarrierFuncs = NULL;
-    screen->base.pScreen       = pScreen;
-    
-    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);
-
-    __glXScreenInit(&screen->base, pScreen);
-
-    screen->base.GLXversion = xstrdup("1.4");
-    screen->base.GLXextensions = xstrdup("GLX_SGIX_fbconfig "
-					 "GLX_SGIS_multisample "
-					 "GLX_ARB_multisample "
-					 "GLX_EXT_visual_info "
-					 "GLX_EXT_import_context ");
-    
-    /*We may be able to add more GLXextensions at a later time. */
-    
-    return &screen->base;
-}
-
-#if 0 // unused
-static void __glXAquaDrawableCopySubBuffer (__GLXdrawable *drawable,
-					    int x, int y, int w, int h) {
-    /*TODO finish me*/
-}
-#endif
-
-static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
-    /* gstaplin: base is the head of the structure, so it's at the same 
-     * offset in memory.
-     * Is this safe with strict aliasing?   I noticed that the other dri code
-     * does this too...
-     */
-    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;
-
-    GLAQUA_DEBUG_MSG(__func__);
-    
-    /* It doesn't work to call DRIDestroySurface here, the drawable's
-       already gone.. But dri.c notices the window destruction and
-       frees the surface itself. */
-
-    /*gstaplin: verify the statement above.  The surface destroy
-     *messages weren't making it through, and may still not be.
-     *We need a good test case for surface creation and destruction.
-     *We also need a good way to enable introspection on the server
-     *to validate the test, beyond using gdb with print.
-     */
-
-    xfree(glxPriv);
-}
-
-static __GLXdrawable *
-__glXAquaScreenCreateDrawable(__GLXscreen *screen,
-			      DrawablePtr pDraw,
-			      int type,
-			      XID drawId,
-			      __GLXconfig *conf) {
-  __GLXAquaDrawable *glxPriv;
-
-  glxPriv = xalloc(sizeof *glxPriv);
-
-  if(glxPriv == NULL)
-      return NULL;
-
-  memset(glxPriv, 0, sizeof *glxPriv);
-
-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
-    xfree(glxPriv);
-    return NULL;
-  }
-
-  glxPriv->base.destroy       = __glXAquaDrawableDestroy;
-  glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;
-  glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */
-
-  glxPriv->pDraw = pDraw;
-  glxPriv->sid = 0;
-  glxPriv->context = NULL;
-  
-  return &glxPriv->base;
-}
-
-// Extra goodies for glx
-
-GLuint __glFloorLog2(GLuint val)
-{
-    int c = 0;
-
-    while (val > 1) {
-        c++;
-        val >>= 1;
-    }
-    return c;
-}
-
-void warn_func(void * p1, char *format, ...) {
-    va_list v;
-    va_start(v, format);
-    vfprintf(stderr, format, v);
-    va_end(v);
-}
-
-static void setup_dispatch_table(void) {
-    struct _glapi_table *disp=_glapi_get_dispatch();
-    _glapi_set_warning_func((_glapi_warning_func)warn_func);
-    _glapi_noop_enable_warnings(TRUE);
-
-    /* to update:
-     * for f in $(grep 'define SET_' ../../../glx/dispatch.h  | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy
-     */
-
-    SET_Accum(disp, glAccum);
-    SET_AlphaFunc(disp, glAlphaFunc);
-    SET_AreTexturesResident(disp, glAreTexturesResident);
-    SET_ArrayElement(disp, glArrayElement);
-    SET_Begin(disp, glBegin);
-    SET_BindTexture(disp, glBindTexture);
-    SET_Bitmap(disp, glBitmap);
-    SET_BlendColor(disp, glBlendColor);
-    SET_BlendEquation(disp, glBlendEquation);
-    SET_BlendFunc(disp, glBlendFunc);
-    SET_CallList(disp, glCallList);
-    SET_CallLists(disp, glCallLists);
-    SET_Clear(disp, glClear);
-    SET_ClearAccum(disp, glClearAccum);
-    SET_ClearColor(disp, glClearColor);
-    SET_ClearDepth(disp, glClearDepth);
-    SET_ClearIndex(disp, glClearIndex);
-    SET_ClearStencil(disp, glClearStencil);
-    SET_ClipPlane(disp, glClipPlane);
-    SET_Color3b(disp, glColor3b);
-    SET_Color3bv(disp, glColor3bv);
-    SET_Color3d(disp, glColor3d);
-    SET_Color3dv(disp, glColor3dv);
-    SET_Color3f(disp, glColor3f);
-    SET_Color3fv(disp, glColor3fv);
-    SET_Color3i(disp, glColor3i);
-    SET_Color3iv(disp, glColor3iv);
-    SET_Color3s(disp, glColor3s);
-    SET_Color3sv(disp, glColor3sv);
-    SET_Color3ub(disp, glColor3ub);
-    SET_Color3ubv(disp, glColor3ubv);
-    SET_Color3ui(disp, glColor3ui);
-    SET_Color3uiv(disp, glColor3uiv);
-    SET_Color3us(disp, glColor3us);
-    SET_Color3usv(disp, glColor3usv);
-    SET_Color4b(disp, glColor4b);
-    SET_Color4bv(disp, glColor4bv);
-    SET_Color4d(disp, glColor4d);
-    SET_Color4dv(disp, glColor4dv);
-    SET_Color4f(disp, glColor4f);
-    SET_Color4fv(disp, glColor4fv);
-    SET_Color4i(disp, glColor4i);
-    SET_Color4iv(disp, glColor4iv);
-    SET_Color4s(disp, glColor4s);
-    SET_Color4sv(disp, glColor4sv);
-    SET_Color4ub(disp, glColor4ub);
-    SET_Color4ubv(disp, glColor4ubv);
-    SET_Color4ui(disp, glColor4ui);
-    SET_Color4uiv(disp, glColor4uiv);
-    SET_Color4us(disp, glColor4us);
-    SET_Color4usv(disp, glColor4usv);
-    SET_ColorMask(disp, glColorMask);
-    SET_ColorMaterial(disp, glColorMaterial);
-    SET_ColorPointer(disp, glColorPointer);
-    SET_ColorSubTable(disp, glColorSubTable);
-    SET_ColorTable(disp, glColorTable);
-    SET_ColorTableParameterfv(disp, glColorTableParameterfv);
-    SET_ColorTableParameteriv(disp, glColorTableParameteriv);
-    SET_ConvolutionFilter1D(disp, glConvolutionFilter1D);
-    SET_ConvolutionFilter2D(disp, glConvolutionFilter2D);
-    SET_ConvolutionParameterf(disp, glConvolutionParameterf);
-    SET_ConvolutionParameterfv(disp, glConvolutionParameterfv);
-    SET_ConvolutionParameteri(disp, glConvolutionParameteri);
-    SET_ConvolutionParameteriv(disp, glConvolutionParameteriv);
-    SET_CopyColorSubTable(disp, glCopyColorSubTable);
-    SET_CopyColorTable(disp, glCopyColorTable);
-    SET_CopyConvolutionFilter1D(disp, glCopyConvolutionFilter1D);
-    SET_CopyConvolutionFilter2D(disp, glCopyConvolutionFilter2D);
-    SET_CopyPixels(disp, glCopyPixels);
-    SET_CopyTexImage1D(disp, glCopyTexImage1D);
-    SET_CopyTexImage2D(disp, glCopyTexImage2D);
-    SET_CopyTexSubImage1D(disp, glCopyTexSubImage1D);
-    SET_CopyTexSubImage2D(disp, glCopyTexSubImage2D);
-    SET_CopyTexSubImage3D(disp, glCopyTexSubImage3D);
-    SET_CullFace(disp, glCullFace);
-    SET_DeleteLists(disp, glDeleteLists);
-    SET_DeleteTextures(disp, glDeleteTextures);
-    SET_DepthFunc(disp, glDepthFunc);
-    SET_DepthMask(disp, glDepthMask);
-    SET_DepthRange(disp, glDepthRange);
-    SET_Disable(disp, glDisable);
-    SET_DisableClientState(disp, glDisableClientState);
-    SET_DrawArrays(disp, glDrawArrays);
-    SET_DrawBuffer(disp, glDrawBuffer);
-    SET_DrawElements(disp, glDrawElements);
-    SET_DrawPixels(disp, glDrawPixels);
-    SET_DrawRangeElements(disp, glDrawRangeElements);
-    SET_EdgeFlag(disp, glEdgeFlag);
-    SET_EdgeFlagPointer(disp, glEdgeFlagPointer);
-    SET_EdgeFlagv(disp, glEdgeFlagv);
-    SET_Enable(disp, glEnable);
-    SET_EnableClientState(disp, glEnableClientState);
-    SET_End(disp, glEnd);
-    SET_EndList(disp, glEndList);
-    SET_EvalCoord1d(disp, glEvalCoord1d);
-    SET_EvalCoord1dv(disp, glEvalCoord1dv);
-    SET_EvalCoord1f(disp, glEvalCoord1f);
-    SET_EvalCoord1fv(disp, glEvalCoord1fv);
-    SET_EvalCoord2d(disp, glEvalCoord2d);
-    SET_EvalCoord2dv(disp, glEvalCoord2dv);
-    SET_EvalCoord2f(disp, glEvalCoord2f);
-    SET_EvalCoord2fv(disp, glEvalCoord2fv);
-    SET_EvalMesh1(disp, glEvalMesh1);
-    SET_EvalMesh2(disp, glEvalMesh2);
-    SET_EvalPoint1(disp, glEvalPoint1);
-    SET_EvalPoint2(disp, glEvalPoint2);
-    SET_FeedbackBuffer(disp, glFeedbackBuffer);
-    SET_Finish(disp, glFinish);
-    SET_Flush(disp, glFlush);
-    SET_Fogf(disp, glFogf);
-    SET_Fogfv(disp, glFogfv);
-    SET_Fogi(disp, glFogi);
-    SET_Fogiv(disp, glFogiv);
-    SET_FrontFace(disp, glFrontFace);
-    SET_Frustum(disp, glFrustum);
-    SET_GenLists(disp, glGenLists);
-    SET_GenTextures(disp, glGenTextures);
-    SET_GetBooleanv(disp, glGetBooleanv);
-    SET_GetClipPlane(disp, glGetClipPlane);
-    SET_GetColorTable(disp, glGetColorTable);
-    SET_GetColorTableParameterfv(disp, glGetColorTableParameterfv);
-    SET_GetColorTableParameteriv(disp, glGetColorTableParameteriv);
-    SET_GetConvolutionFilter(disp, glGetConvolutionFilter);
-    SET_GetConvolutionParameterfv(disp, glGetConvolutionParameterfv);
-    SET_GetConvolutionParameteriv(disp, glGetConvolutionParameteriv);
-    SET_GetDoublev(disp, glGetDoublev);
-    SET_GetError(disp, glGetError);
-    SET_GetFloatv(disp, glGetFloatv);
-    SET_GetHistogram(disp, glGetHistogram);
-    SET_GetHistogramParameterfv(disp, glGetHistogramParameterfv);
-    SET_GetHistogramParameteriv(disp, glGetHistogramParameteriv);
-    SET_GetIntegerv(disp, glGetIntegerv);
-    SET_GetLightfv(disp, glGetLightfv);
-    SET_GetLightiv(disp, glGetLightiv);
-    SET_GetMapdv(disp, glGetMapdv);
-    SET_GetMapfv(disp, glGetMapfv);
-    SET_GetMapiv(disp, glGetMapiv);
-    SET_GetMaterialfv(disp, glGetMaterialfv);
-    SET_GetMaterialiv(disp, glGetMaterialiv);
-    SET_GetMinmax(disp, glGetMinmax);
-    SET_GetMinmaxParameterfv(disp, glGetMinmaxParameterfv);
-    SET_GetMinmaxParameteriv(disp, glGetMinmaxParameteriv);
-    SET_GetPixelMapfv(disp, glGetPixelMapfv);
-    SET_GetPixelMapuiv(disp, glGetPixelMapuiv);
-    SET_GetPixelMapusv(disp, glGetPixelMapusv);
-    SET_GetPointerv(disp, glGetPointerv);
-    SET_GetPolygonStipple(disp, glGetPolygonStipple);
-    SET_GetSeparableFilter(disp, glGetSeparableFilter);
-    SET_GetString(disp, glGetString);
-    SET_GetTexEnvfv(disp, glGetTexEnvfv);
-    SET_GetTexEnviv(disp, glGetTexEnviv);
-    SET_GetTexGendv(disp, glGetTexGendv);
-    SET_GetTexGenfv(disp, glGetTexGenfv);
-    SET_GetTexGeniv(disp, glGetTexGeniv);
-    SET_GetTexImage(disp, glGetTexImage);
-    SET_GetTexLevelParameterfv(disp, glGetTexLevelParameterfv);
-    SET_GetTexLevelParameteriv(disp, glGetTexLevelParameteriv);
-    SET_GetTexParameterfv(disp, glGetTexParameterfv);
-    SET_GetTexParameteriv(disp, glGetTexParameteriv);
-    SET_Hint(disp, glHint);
-    SET_Histogram(disp, glHistogram);
-    SET_IndexMask(disp, glIndexMask);
-    SET_IndexPointer(disp, glIndexPointer);
-    SET_Indexd(disp, glIndexd);
-    SET_Indexdv(disp, glIndexdv);
-    SET_Indexf(disp, glIndexf);
-    SET_Indexfv(disp, glIndexfv);
-    SET_Indexi(disp, glIndexi);
-    SET_Indexiv(disp, glIndexiv);
-    SET_Indexs(disp, glIndexs);
-    SET_Indexsv(disp, glIndexsv);
-    SET_Indexub(disp, glIndexub);
-    SET_Indexubv(disp, glIndexubv);
-    SET_InitNames(disp, glInitNames);
-    SET_InterleavedArrays(disp, glInterleavedArrays);
-    SET_IsEnabled(disp, glIsEnabled);
-    SET_IsList(disp, glIsList);
-    SET_IsTexture(disp, glIsTexture);
-    SET_LightModelf(disp, glLightModelf);
-    SET_LightModelfv(disp, glLightModelfv);
-    SET_LightModeli(disp, glLightModeli);
-    SET_LightModeliv(disp, glLightModeliv);
-    SET_Lightf(disp, glLightf);
-    SET_Lightfv(disp, glLightfv);
-    SET_Lighti(disp, glLighti);
-    SET_Lightiv(disp, glLightiv);
-    SET_LineStipple(disp, glLineStipple);
-    SET_LineWidth(disp, glLineWidth);
-    SET_ListBase(disp, glListBase);
-    SET_LoadIdentity(disp, glLoadIdentity);
-    SET_LoadMatrixd(disp, glLoadMatrixd);
-    SET_LoadMatrixf(disp, glLoadMatrixf);
-    SET_LoadName(disp, glLoadName);
-    SET_LogicOp(disp, glLogicOp);
-    SET_Map1d(disp, glMap1d);
-    SET_Map1f(disp, glMap1f);
-    SET_Map2d(disp, glMap2d);
-    SET_Map2f(disp, glMap2f);
-    SET_MapGrid1d(disp, glMapGrid1d);
-    SET_MapGrid1f(disp, glMapGrid1f);
-    SET_MapGrid2d(disp, glMapGrid2d);
-    SET_MapGrid2f(disp, glMapGrid2f);
-    SET_Materialf(disp, glMaterialf);
-    SET_Materialfv(disp, glMaterialfv);
-    SET_Materiali(disp, glMateriali);
-    SET_Materialiv(disp, glMaterialiv);
-    SET_MatrixMode(disp, glMatrixMode);
-    SET_Minmax(disp, glMinmax);
-    SET_MultMatrixd(disp, glMultMatrixd);
-    SET_MultMatrixf(disp, glMultMatrixf);
-    SET_NewList(disp, glNewList);
-    SET_Normal3b(disp, glNormal3b);
-    SET_Normal3bv(disp, glNormal3bv);
-    SET_Normal3d(disp, glNormal3d);
-    SET_Normal3dv(disp, glNormal3dv);
-    SET_Normal3f(disp, glNormal3f);
-    SET_Normal3fv(disp, glNormal3fv);
-    SET_Normal3i(disp, glNormal3i);
-    SET_Normal3iv(disp, glNormal3iv);
-    SET_Normal3s(disp, glNormal3s);
-    SET_Normal3sv(disp, glNormal3sv);
-    SET_NormalPointer(disp, glNormalPointer);
-    SET_Ortho(disp, glOrtho);
-    SET_PassThrough(disp, glPassThrough);
-    SET_PixelMapfv(disp, glPixelMapfv);
-    SET_PixelMapuiv(disp, glPixelMapuiv);
-    SET_PixelMapusv(disp, glPixelMapusv);
-    SET_PixelStoref(disp, glPixelStoref);
-    SET_PixelStorei(disp, glPixelStorei);
-    SET_PixelTransferf(disp, glPixelTransferf);
-    SET_PixelTransferi(disp, glPixelTransferi);
-    SET_PixelZoom(disp, glPixelZoom);
-    SET_PointSize(disp, glPointSize);
-    SET_PolygonMode(disp, glPolygonMode);
-    SET_PolygonOffset(disp, glPolygonOffset);
-    SET_PolygonStipple(disp, glPolygonStipple);
-    SET_PopAttrib(disp, glPopAttrib);
-    SET_PopClientAttrib(disp, glPopClientAttrib);
-    SET_PopMatrix(disp, glPopMatrix);
-    SET_PopName(disp, glPopName);
-    SET_PrioritizeTextures(disp, glPrioritizeTextures);
-    SET_PushAttrib(disp, glPushAttrib);
-    SET_PushClientAttrib(disp, glPushClientAttrib);
-    SET_PushMatrix(disp, glPushMatrix);
-    SET_PushName(disp, glPushName);
-    SET_RasterPos2d(disp, glRasterPos2d);
-    SET_RasterPos2dv(disp, glRasterPos2dv);
-    SET_RasterPos2f(disp, glRasterPos2f);
-    SET_RasterPos2fv(disp, glRasterPos2fv);
-    SET_RasterPos2i(disp, glRasterPos2i);
-    SET_RasterPos2iv(disp, glRasterPos2iv);
-    SET_RasterPos2s(disp, glRasterPos2s);
-    SET_RasterPos2sv(disp, glRasterPos2sv);
-    SET_RasterPos3d(disp, glRasterPos3d);
-    SET_RasterPos3dv(disp, glRasterPos3dv);
-    SET_RasterPos3f(disp, glRasterPos3f);
-    SET_RasterPos3fv(disp, glRasterPos3fv);
-    SET_RasterPos3i(disp, glRasterPos3i);
-    SET_RasterPos3iv(disp, glRasterPos3iv);
-    SET_RasterPos3s(disp, glRasterPos3s);
-    SET_RasterPos3sv(disp, glRasterPos3sv);
-    SET_RasterPos4d(disp, glRasterPos4d);
-    SET_RasterPos4dv(disp, glRasterPos4dv);
-    SET_RasterPos4f(disp, glRasterPos4f);
-    SET_RasterPos4fv(disp, glRasterPos4fv);
-    SET_RasterPos4i(disp, glRasterPos4i);
-    SET_RasterPos4iv(disp, glRasterPos4iv);
-    SET_RasterPos4s(disp, glRasterPos4s);
-    SET_RasterPos4sv(disp, glRasterPos4sv);
-    SET_ReadBuffer(disp, glReadBuffer);
-    SET_ReadPixels(disp, glReadPixels);
-    SET_Rectd(disp, glRectd);
-    SET_Rectdv(disp, glRectdv);
-    SET_Rectf(disp, glRectf);
-    SET_Rectfv(disp, glRectfv);
-    SET_Recti(disp, glRecti);
-    SET_Rectiv(disp, glRectiv);
-    SET_Rects(disp, glRects);
-    SET_Rectsv(disp, glRectsv);
-    SET_RenderMode(disp, glRenderMode);
-    SET_ResetHistogram(disp, glResetHistogram);
-    SET_ResetMinmax(disp, glResetMinmax);
-    SET_Rotated(disp, glRotated);
-    SET_Rotatef(disp, glRotatef);
-    SET_Scaled(disp, glScaled);
-    SET_Scalef(disp, glScalef);
-    SET_Scissor(disp, glScissor);
-    SET_SelectBuffer(disp, glSelectBuffer);
-    SET_SeparableFilter2D(disp, glSeparableFilter2D);
-    SET_ShadeModel(disp, glShadeModel);
-    SET_StencilFunc(disp, glStencilFunc);
-    SET_StencilMask(disp, glStencilMask);
-    SET_StencilOp(disp, glStencilOp);
-    SET_TexCoord1d(disp, glTexCoord1d);
-    SET_TexCoord1dv(disp, glTexCoord1dv);
-    SET_TexCoord1f(disp, glTexCoord1f);
-    SET_TexCoord1fv(disp, glTexCoord1fv);
-    SET_TexCoord1i(disp, glTexCoord1i);
-    SET_TexCoord1iv(disp, glTexCoord1iv);
-    SET_TexCoord1s(disp, glTexCoord1s);
-    SET_TexCoord1sv(disp, glTexCoord1sv);
-    SET_TexCoord2d(disp, glTexCoord2d);
-    SET_TexCoord2dv(disp, glTexCoord2dv);
-    SET_TexCoord2f(disp, glTexCoord2f);
-    SET_TexCoord2fv(disp, glTexCoord2fv);
-    SET_TexCoord2i(disp, glTexCoord2i);
-    SET_TexCoord2iv(disp, glTexCoord2iv);
-    SET_TexCoord2s(disp, glTexCoord2s);
-    SET_TexCoord2sv(disp, glTexCoord2sv);
-    SET_TexCoord3d(disp, glTexCoord3d);
-    SET_TexCoord3dv(disp, glTexCoord3dv);
-    SET_TexCoord3f(disp, glTexCoord3f);
-    SET_TexCoord3fv(disp, glTexCoord3fv);
-    SET_TexCoord3i(disp, glTexCoord3i);
-    SET_TexCoord3iv(disp, glTexCoord3iv);
-    SET_TexCoord3s(disp, glTexCoord3s);
-    SET_TexCoord3sv(disp, glTexCoord3sv);
-    SET_TexCoord4d(disp, glTexCoord4d);
-    SET_TexCoord4dv(disp, glTexCoord4dv);
-    SET_TexCoord4f(disp, glTexCoord4f);
-    SET_TexCoord4fv(disp, glTexCoord4fv);
-    SET_TexCoord4i(disp, glTexCoord4i);
-    SET_TexCoord4iv(disp, glTexCoord4iv);
-    SET_TexCoord4s(disp, glTexCoord4s);
-    SET_TexCoord4sv(disp, glTexCoord4sv);
-    SET_TexCoordPointer(disp, glTexCoordPointer);
-    SET_TexEnvf(disp, glTexEnvf);
-    SET_TexEnvfv(disp, glTexEnvfv);
-    SET_TexEnvi(disp, glTexEnvi);
-    SET_TexEnviv(disp, glTexEnviv);
-    SET_TexGend(disp, glTexGend);
-    SET_TexGendv(disp, glTexGendv);
-    SET_TexGenf(disp, glTexGenf);
-    SET_TexGenfv(disp, glTexGenfv);
-    SET_TexGeni(disp, glTexGeni);
-    SET_TexGeniv(disp, glTexGeniv);
-    
-    /* Pointer Incompatability:
-     * internalformat is a GLenum according to /System/Library/Frameworks/OpenGL.framework/Headers/gl.h
-     * extern void glTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-     * extern void glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-     * extern void glTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-     *
-     * and it's a GLint in glx/glapitable.h and according to the man page
-     * void ( * TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
-     * void ( * TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
-     * void ( * TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);
-     *
-     * <rdar://problem/6953344> gl.h contains incorrect prototypes for glTexImage[123]D
-     */
-    
-    SET_TexImage1D(disp, (void *)glTexImage1D);
-    SET_TexImage2D(disp, (void *)glTexImage2D);
-    SET_TexImage3D(disp, (void *)glTexImage3D);
-    SET_TexParameterf(disp, glTexParameterf);
-    SET_TexParameterfv(disp, glTexParameterfv);
-    SET_TexParameteri(disp, glTexParameteri);
-    SET_TexParameteriv(disp, glTexParameteriv);
-    SET_TexSubImage1D(disp, glTexSubImage1D);
-    SET_TexSubImage2D(disp, glTexSubImage2D);
-    SET_TexSubImage3D(disp, glTexSubImage3D);
-    SET_Translated(disp, glTranslated);
-    SET_Translatef(disp, glTranslatef);
-    SET_Vertex2d(disp, glVertex2d);
-    SET_Vertex2dv(disp, glVertex2dv);
-    SET_Vertex2f(disp, glVertex2f);
-    SET_Vertex2fv(disp, glVertex2fv);
-    SET_Vertex2i(disp, glVertex2i);
-    SET_Vertex2iv(disp, glVertex2iv);
-    SET_Vertex2s(disp, glVertex2s);
-    SET_Vertex2sv(disp, glVertex2sv);
-    SET_Vertex3d(disp, glVertex3d);
-    SET_Vertex3dv(disp, glVertex3dv);
-    SET_Vertex3f(disp, glVertex3f);
-    SET_Vertex3fv(disp, glVertex3fv);
-    SET_Vertex3i(disp, glVertex3i);
-    SET_Vertex3iv(disp, glVertex3iv);
-    SET_Vertex3s(disp, glVertex3s);
-    SET_Vertex3sv(disp, glVertex3sv);
-    SET_Vertex4d(disp, glVertex4d);
-    SET_Vertex4dv(disp, glVertex4dv);
-    SET_Vertex4f(disp, glVertex4f);
-    SET_Vertex4fv(disp, glVertex4fv);
-    SET_Vertex4i(disp, glVertex4i);
-    SET_Vertex4iv(disp, glVertex4iv);
-    SET_Vertex4s(disp, glVertex4s);
-    SET_Vertex4sv(disp, glVertex4sv);
-    SET_VertexPointer(disp, glVertexPointer);
-    SET_Viewport(disp, glViewport);
-
-#if GL_VERSION_2_0
-    SET_AttachShader(disp, glAttachShader);
-    SET_DeleteShader(disp, glDeleteShader);
-    SET_DetachShader(disp, glDetachShader);
-    SET_GetAttachedShaders(disp, glGetAttachedShaders);
-    SET_GetProgramInfoLog(disp, glGetProgramInfoLog);
-    SET_GetShaderInfoLog(disp, glGetShaderInfoLog);
-    SET_GetShaderiv(disp, glGetShaderiv);
-    SET_IsShader(disp, glIsShader);
-    SET_StencilFuncSeparate(disp, glStencilFuncSeparate);
-    SET_StencilMaskSeparate(disp, glStencilMaskSeparate);
-    SET_StencilOpSeparate(disp, glStencilOpSeparate);
-#endif
-
-#if GL_VERSION_2_1
-    SET_UniformMatrix2x3fv(disp, glUniformMatrix2x3fv);
-    SET_UniformMatrix2x4fv(disp, glUniformMatrix2x4fv);
-    SET_UniformMatrix3x2fv(disp, glUniformMatrix3x2fv);
-    SET_UniformMatrix3x4fv(disp, glUniformMatrix3x4fv);
-    SET_UniformMatrix4x2fv(disp, glUniformMatrix4x2fv);
-    SET_UniformMatrix4x3fv(disp, glUniformMatrix4x3fv);
-#endif
-
-#if GL_APPLE_vertex_array_object
-    SET_BindVertexArrayAPPLE(disp, glBindVertexArrayAPPLE);
-    SET_DeleteVertexArraysAPPLE(disp, glDeleteVertexArraysAPPLE);
-    SET_GenVertexArraysAPPLE(disp, glGenVertexArraysAPPLE);
-    SET_IsVertexArrayAPPLE(disp, glIsVertexArrayAPPLE);
-#endif
-
-#if GL_ARB_draw_buffers
-    SET_DrawBuffersARB(disp, glDrawBuffersARB);
-#endif
-
-#if GL_ARB_multisample
-    SET_SampleCoverageARB(disp, glSampleCoverageARB);
-#endif
-
-#if GL_ARB_multitexture
-    SET_ActiveTextureARB(disp, glActiveTextureARB);
-    SET_ClientActiveTextureARB(disp, glClientActiveTextureARB);
-    SET_MultiTexCoord1dARB(disp, glMultiTexCoord1dARB);
-    SET_MultiTexCoord1dvARB(disp, glMultiTexCoord1dvARB);
-    SET_MultiTexCoord1fARB(disp, glMultiTexCoord1fARB);
-    SET_MultiTexCoord1fvARB(disp, glMultiTexCoord1fvARB);
-    SET_MultiTexCoord1iARB(disp, glMultiTexCoord1iARB);
-    SET_MultiTexCoord1ivARB(disp, glMultiTexCoord1ivARB);
-    SET_MultiTexCoord1sARB(disp, glMultiTexCoord1sARB);
-    SET_MultiTexCoord1svARB(disp, glMultiTexCoord1svARB);
-    SET_MultiTexCoord2dARB(disp, glMultiTexCoord2dARB);
-    SET_MultiTexCoord2dvARB(disp, glMultiTexCoord2dvARB);
-    SET_MultiTexCoord2fARB(disp, glMultiTexCoord2fARB);
-    SET_MultiTexCoord2fvARB(disp, glMultiTexCoord2fvARB);
-    SET_MultiTexCoord2iARB(disp, glMultiTexCoord2iARB);
-    SET_MultiTexCoord2ivARB(disp, glMultiTexCoord2ivARB);
-    SET_MultiTexCoord2sARB(disp, glMultiTexCoord2sARB);
-    SET_MultiTexCoord2svARB(disp, glMultiTexCoord2svARB);
-    SET_MultiTexCoord3dARB(disp, glMultiTexCoord3dARB);
-    SET_MultiTexCoord3dvARB(disp, glMultiTexCoord3dvARB);
-    SET_MultiTexCoord3fARB(disp, glMultiTexCoord3fARB);
-    SET_MultiTexCoord3fvARB(disp, glMultiTexCoord3fvARB);
-    SET_MultiTexCoord3iARB(disp, glMultiTexCoord3iARB);
-    SET_MultiTexCoord3ivARB(disp, glMultiTexCoord3ivARB);
-    SET_MultiTexCoord3sARB(disp, glMultiTexCoord3sARB);
-    SET_MultiTexCoord3svARB(disp, glMultiTexCoord3svARB);
-    SET_MultiTexCoord4dARB(disp, glMultiTexCoord4dARB);
-    SET_MultiTexCoord4dvARB(disp, glMultiTexCoord4dvARB);
-    SET_MultiTexCoord4fARB(disp, glMultiTexCoord4fARB);
-    SET_MultiTexCoord4fvARB(disp, glMultiTexCoord4fvARB);
-    SET_MultiTexCoord4iARB(disp, glMultiTexCoord4iARB);
-    SET_MultiTexCoord4ivARB(disp, glMultiTexCoord4ivARB);
-    SET_MultiTexCoord4sARB(disp, glMultiTexCoord4sARB);
-    SET_MultiTexCoord4svARB(disp, glMultiTexCoord4svARB);
-#endif
-
-#if GL_ARB_occlusion_query
-    SET_BeginQueryARB(disp, glBeginQueryARB);
-    SET_DeleteQueriesARB(disp, glDeleteQueriesARB);
-    SET_EndQueryARB(disp, glEndQueryARB);
-    SET_GenQueriesARB(disp, glGenQueriesARB);
-    SET_GetQueryObjectivARB(disp, glGetQueryObjectivARB);
-    SET_GetQueryObjectuivARB(disp, glGetQueryObjectuivARB);
-    SET_GetQueryivARB(disp, glGetQueryivARB);
-    SET_IsQueryARB(disp, glIsQueryARB);
-#endif
-
-#if GL_ARB_shader_objects
-    SET_AttachObjectARB(disp, glAttachObjectARB);
-    SET_CompileShaderARB(disp, glCompileShaderARB);
-    SET_DeleteObjectARB(disp, glDeleteObjectARB);
-    SET_GetHandleARB(disp, glGetHandleARB);
-    SET_DetachObjectARB(disp, glDetachObjectARB);
-    SET_CreateProgramObjectARB(disp, glCreateProgramObjectARB);
-    SET_CreateShaderObjectARB(disp, glCreateShaderObjectARB);
-    SET_GetInfoLogARB(disp, glGetInfoLogARB);
-    SET_GetActiveUniformARB(disp, glGetActiveUniformARB);
-    SET_GetAttachedObjectsARB(disp, glGetAttachedObjectsARB);
-    SET_GetObjectParameterfvARB(disp, glGetObjectParameterfvARB);
-    SET_GetObjectParameterivARB(disp, glGetObjectParameterivARB);
-    SET_GetShaderSourceARB(disp, glGetShaderSourceARB);
-    SET_GetUniformLocationARB(disp, glGetUniformLocationARB);
-    SET_GetUniformfvARB(disp, glGetUniformfvARB);
-    SET_GetUniformivARB(disp, glGetUniformivARB);
-    SET_LinkProgramARB(disp, glLinkProgramARB);
-    SET_ShaderSourceARB(disp, glShaderSourceARB);
-    SET_Uniform1fARB(disp, glUniform1fARB);
-    SET_Uniform1fvARB(disp, glUniform1fvARB);
-    SET_Uniform1iARB(disp, glUniform1iARB);
-    SET_Uniform1ivARB(disp, glUniform1ivARB);
-    SET_Uniform2fARB(disp, glUniform2fARB);
-    SET_Uniform2fvARB(disp, glUniform2fvARB);
-    SET_Uniform2iARB(disp, glUniform2iARB);
-    SET_Uniform2ivARB(disp, glUniform2ivARB);
-    SET_Uniform3fARB(disp, glUniform3fARB);
-    SET_Uniform3fvARB(disp, glUniform3fvARB);
-    SET_Uniform3iARB(disp, glUniform3iARB);
-    SET_Uniform3ivARB(disp, glUniform3ivARB);
-    SET_Uniform4fARB(disp, glUniform4fARB);
-    SET_Uniform4fvARB(disp, glUniform4fvARB);
-    SET_Uniform4iARB(disp, glUniform4iARB);
-    SET_Uniform4ivARB(disp, glUniform4ivARB);
-    SET_UniformMatrix2fvARB(disp, glUniformMatrix2fvARB);
-    SET_UniformMatrix3fvARB(disp, glUniformMatrix3fvARB);
-    SET_UniformMatrix4fvARB(disp, glUniformMatrix4fvARB);
-    SET_UseProgramObjectARB(disp, glUseProgramObjectARB);
-    SET_ValidateProgramARB(disp, glValidateProgramARB);
-#endif
-
-#if GL_ARB_texture_compression
-    SET_CompressedTexImage1DARB(disp, glCompressedTexImage1DARB);
-    SET_CompressedTexImage2DARB(disp, glCompressedTexImage2DARB);
-    SET_CompressedTexImage3DARB(disp, glCompressedTexImage3DARB);
-    SET_CompressedTexSubImage1DARB(disp, glCompressedTexSubImage1DARB);
-    SET_CompressedTexSubImage2DARB(disp, glCompressedTexSubImage2DARB);
-    SET_CompressedTexSubImage3DARB(disp, glCompressedTexSubImage3DARB);
-    SET_GetCompressedTexImageARB(disp, glGetCompressedTexImageARB);
-#endif
-
-#if GL_ARB_transpose_matrix
-    SET_LoadTransposeMatrixdARB(disp, glLoadTransposeMatrixdARB);
-    SET_LoadTransposeMatrixfARB(disp, glLoadTransposeMatrixfARB);
-    SET_MultTransposeMatrixdARB(disp, glMultTransposeMatrixdARB);
-    SET_MultTransposeMatrixfARB(disp, glMultTransposeMatrixfARB);
-#endif
-
-#if GL_ARB_vertex_buffer_object
-    SET_BindBufferARB(disp, glBindBufferARB);
-    SET_BufferDataARB(disp, glBufferDataARB);
-    SET_BufferSubDataARB(disp, glBufferSubDataARB);
-    SET_DeleteBuffersARB(disp, glDeleteBuffersARB);
-    SET_GenBuffersARB(disp, glGenBuffersARB);
-    SET_GetBufferParameterivARB(disp, glGetBufferParameterivARB);
-    SET_GetBufferPointervARB(disp, glGetBufferPointervARB);
-    SET_GetBufferSubDataARB(disp, glGetBufferSubDataARB);
-    SET_IsBufferARB(disp, glIsBufferARB);
-    SET_MapBufferARB(disp, glMapBufferARB);
-    SET_UnmapBufferARB(disp, glUnmapBufferARB);
-#endif
-
-#if GL_ARB_vertex_program
-    SET_DisableVertexAttribArrayARB(disp, glDisableVertexAttribArrayARB);
-    SET_EnableVertexAttribArrayARB(disp, glEnableVertexAttribArrayARB);
-    SET_GetProgramEnvParameterdvARB(disp, glGetProgramEnvParameterdvARB);
-    SET_GetProgramEnvParameterfvARB(disp, glGetProgramEnvParameterfvARB);
-    SET_GetProgramLocalParameterdvARB(disp, glGetProgramLocalParameterdvARB);
-    SET_GetProgramLocalParameterfvARB(disp, glGetProgramLocalParameterfvARB);
-    SET_GetProgramStringARB(disp, glGetProgramStringARB);
-    SET_GetProgramivARB(disp, glGetProgramivARB);
-    SET_GetVertexAttribdvARB(disp, glGetVertexAttribdvARB);
-    SET_GetVertexAttribfvARB(disp, glGetVertexAttribfvARB);
-    SET_GetVertexAttribivARB(disp, glGetVertexAttribivARB);
-    SET_ProgramEnvParameter4dARB(disp, glProgramEnvParameter4dARB);
-    SET_ProgramEnvParameter4dvARB(disp, glProgramEnvParameter4dvARB);
-    SET_ProgramEnvParameter4fARB(disp, glProgramEnvParameter4fARB);
-    SET_ProgramEnvParameter4fvARB(disp, glProgramEnvParameter4fvARB);
-    SET_ProgramLocalParameter4dARB(disp, glProgramLocalParameter4dARB);
-    SET_ProgramLocalParameter4dvARB(disp, glProgramLocalParameter4dvARB);
-    SET_ProgramLocalParameter4fARB(disp, glProgramLocalParameter4fARB);
-    SET_ProgramLocalParameter4fvARB(disp, glProgramLocalParameter4fvARB);
-    SET_ProgramStringARB(disp, glProgramStringARB);
-    SET_VertexAttrib1dARB(disp, glVertexAttrib1dARB);
-    SET_VertexAttrib1dvARB(disp, glVertexAttrib1dvARB);
-    SET_VertexAttrib1fARB(disp, glVertexAttrib1fARB);
-    SET_VertexAttrib1fvARB(disp, glVertexAttrib1fvARB);
-    SET_VertexAttrib1sARB(disp, glVertexAttrib1sARB);
-    SET_VertexAttrib1svARB(disp, glVertexAttrib1svARB);
-    SET_VertexAttrib2dARB(disp, glVertexAttrib2dARB);
-    SET_VertexAttrib2dvARB(disp, glVertexAttrib2dvARB);
-    SET_VertexAttrib2fARB(disp, glVertexAttrib2fARB);
-    SET_VertexAttrib2fvARB(disp, glVertexAttrib2fvARB);
-    SET_VertexAttrib2sARB(disp, glVertexAttrib2sARB);
-    SET_VertexAttrib2svARB(disp, glVertexAttrib2svARB);
-    SET_VertexAttrib3dARB(disp, glVertexAttrib3dARB);
-    SET_VertexAttrib3dvARB(disp, glVertexAttrib3dvARB);
-    SET_VertexAttrib3fARB(disp, glVertexAttrib3fARB);
-    SET_VertexAttrib3fvARB(disp, glVertexAttrib3fvARB);
-    SET_VertexAttrib3sARB(disp, glVertexAttrib3sARB);
-    SET_VertexAttrib3svARB(disp, glVertexAttrib3svARB);
-    SET_VertexAttrib4NbvARB(disp, glVertexAttrib4NbvARB);
-    SET_VertexAttrib4NivARB(disp, glVertexAttrib4NivARB);
-    SET_VertexAttrib4NsvARB(disp, glVertexAttrib4NsvARB);
-    SET_VertexAttrib4NubARB(disp, glVertexAttrib4NubARB);
-    SET_VertexAttrib4NubvARB(disp, glVertexAttrib4NubvARB);
-    SET_VertexAttrib4NuivARB(disp, glVertexAttrib4NuivARB);
-    SET_VertexAttrib4NusvARB(disp, glVertexAttrib4NusvARB);
-    SET_VertexAttrib4bvARB(disp, glVertexAttrib4bvARB);
-    SET_VertexAttrib4dARB(disp, glVertexAttrib4dARB);
-    SET_VertexAttrib4dvARB(disp, glVertexAttrib4dvARB);
-    SET_VertexAttrib4fARB(disp, glVertexAttrib4fARB);
-    SET_VertexAttrib4fvARB(disp, glVertexAttrib4fvARB);
-    SET_VertexAttrib4ivARB(disp, glVertexAttrib4ivARB);
-    SET_VertexAttrib4sARB(disp, glVertexAttrib4sARB);
-    SET_VertexAttrib4svARB(disp, glVertexAttrib4svARB);
-    SET_VertexAttrib4ubvARB(disp, glVertexAttrib4ubvARB);
-    SET_VertexAttrib4uivARB(disp, glVertexAttrib4uivARB);
-    SET_VertexAttrib4usvARB(disp, glVertexAttrib4usvARB);
-    SET_VertexAttribPointerARB(disp, glVertexAttribPointerARB);
-#endif
-
-#if GL_ARB_vertex_shader
-    SET_BindAttribLocationARB(disp, glBindAttribLocationARB);
-    SET_GetActiveAttribARB(disp, glGetActiveAttribARB);
-    SET_GetAttribLocationARB(disp, glGetAttribLocationARB);
-#endif
-
-#if GL_ARB_window_pos
-    SET_WindowPos2dMESA(disp, glWindowPos2dARB);
-    SET_WindowPos2dvMESA(disp, glWindowPos2dvARB);
-    SET_WindowPos2fMESA(disp, glWindowPos2fARB);
-    SET_WindowPos2fvMESA(disp, glWindowPos2fvARB);
-    SET_WindowPos2iMESA(disp, glWindowPos2iARB);
-    SET_WindowPos2ivMESA(disp, glWindowPos2ivARB);
-    SET_WindowPos2sMESA(disp, glWindowPos2sARB);
-    SET_WindowPos2svMESA(disp, glWindowPos2svARB);
-    SET_WindowPos3dMESA(disp, glWindowPos3dARB);
-    SET_WindowPos3dvMESA(disp, glWindowPos3dvARB);
-    SET_WindowPos3fMESA(disp, glWindowPos3fARB);
-    SET_WindowPos3fvMESA(disp, glWindowPos3fvARB);
-    SET_WindowPos3iMESA(disp, glWindowPos3iARB);
-    SET_WindowPos3ivMESA(disp, glWindowPos3ivARB);
-    SET_WindowPos3sMESA(disp, glWindowPos3sARB);
-    SET_WindowPos3svMESA(disp, glWindowPos3svARB);
-#endif
-
-#if GL_ATI_fragment_shader
-    SET_AlphaFragmentOp1ATI(disp, glAlphaFragmentOp1ATI);
-    SET_AlphaFragmentOp2ATI(disp, glAlphaFragmentOp2ATI);
-    SET_AlphaFragmentOp3ATI(disp, glAlphaFragmentOp3ATI);
-    SET_BeginFragmentShaderATI(disp, glBeginFragmentShaderATI);
-    SET_BindFragmentShaderATI(disp, glBindFragmentShaderATI);
-    SET_ColorFragmentOp1ATI(disp, glColorFragmentOp1ATI);
-    SET_ColorFragmentOp2ATI(disp, glColorFragmentOp2ATI);
-    SET_ColorFragmentOp3ATI(disp, glColorFragmentOp3ATI);
-    SET_DeleteFragmentShaderATI(disp, glDeleteFragmentShaderATI);
-    SET_EndFragmentShaderATI(disp, glEndFragmentShaderATI);
-    SET_GenFragmentShadersATI(disp, glGenFragmentShadersATI);
-    SET_PassTexCoordATI(disp, glPassTexCoordATI);
-    SET_SampleMapATI(disp, glSampleMapATI);
-    SET_SetFragmentShaderConstantATI(disp, glSetFragmentShaderConstantATI);
-#elif GL_EXT_fragment_shader
-    SET_AlphaFragmentOp1ATI(disp, glAlphaFragmentOp1EXT);
-    SET_AlphaFragmentOp2ATI(disp, glAlphaFragmentOp2EXT);
-    SET_AlphaFragmentOp3ATI(disp, glAlphaFragmentOp3EXT);
-    SET_BeginFragmentShaderATI(disp, glBeginFragmentShaderEXT);
-    SET_BindFragmentShaderATI(disp, glBindFragmentShaderEXT);
-    SET_ColorFragmentOp1ATI(disp, glColorFragmentOp1EXT);
-    SET_ColorFragmentOp2ATI(disp, glColorFragmentOp2EXT);
-    SET_ColorFragmentOp3ATI(disp, glColorFragmentOp3EXT);
-    SET_DeleteFragmentShaderATI(disp, glDeleteFragmentShaderEXT);
-    SET_EndFragmentShaderATI(disp, glEndFragmentShaderEXT);
-    SET_GenFragmentShadersATI(disp, glGenFragmentShadersEXT);
-    SET_PassTexCoordATI(disp, glPassTexCoordEXT);
-    SET_SampleMapATI(disp, glSampleMapEXT);
-    SET_SetFragmentShaderConstantATI(disp, glSetFragmentShaderConstantEXT);
-#endif
-
-#if GL_ATI_separate_stencil
-    SET_StencilFuncSeparateATI(disp, glStencilFuncSeparateATI);
-#endif
-
-#if GL_EXT_blend_equation_separate
-    SET_BlendEquationSeparateEXT(disp, glBlendEquationSeparateEXT);
-#endif
-
-#if GL_EXT_blend_func_separate
-    SET_BlendFuncSeparateEXT(disp, glBlendFuncSeparateEXT);
-#endif
-
-#if GL_EXT_depth_bounds_test
-    SET_DepthBoundsEXT(disp, glDepthBoundsEXT);
-#endif
-
-#if GL_EXT_compiled_vertex_array
-    SET_LockArraysEXT(disp, glLockArraysEXT);
-    SET_UnlockArraysEXT(disp, glUnlockArraysEXT);
-#endif
-
-#if GL_EXT_cull_vertex
-    SET_CullParameterdvEXT(disp, glCullParameterdvEXT);
-    SET_CullParameterfvEXT(disp, glCullParameterfvEXT);
-#endif
-
-#if GL_EXT_fog_coord
-    SET_FogCoordPointerEXT(disp, glFogCoordPointerEXT);
-    SET_FogCoorddEXT(disp, glFogCoorddEXT);
-    SET_FogCoorddvEXT(disp, glFogCoorddvEXT);
-    SET_FogCoordfEXT(disp, glFogCoordfEXT);
-    SET_FogCoordfvEXT(disp, glFogCoordfvEXT);
-#endif
-
-#if GL_EXT_framebuffer_blit
-    SET_BlitFramebufferEXT(disp, glBlitFramebufferEXT);
-#endif
-
-#if GL_EXT_framebuffer_object
-    SET_BindFramebufferEXT(disp, glBindFramebufferEXT);
-    SET_BindRenderbufferEXT(disp, glBindRenderbufferEXT);
-    SET_CheckFramebufferStatusEXT(disp, glCheckFramebufferStatusEXT);
-    SET_DeleteFramebuffersEXT(disp, glDeleteFramebuffersEXT);
-    SET_DeleteRenderbuffersEXT(disp, glDeleteRenderbuffersEXT);
-    SET_FramebufferRenderbufferEXT(disp, glFramebufferRenderbufferEXT);
-    SET_FramebufferTexture1DEXT(disp, glFramebufferTexture1DEXT);
-    SET_FramebufferTexture2DEXT(disp, glFramebufferTexture2DEXT);
-    SET_FramebufferTexture3DEXT(disp, glFramebufferTexture3DEXT);
-    SET_GenerateMipmapEXT(disp, glGenerateMipmapEXT);
-    SET_GenFramebuffersEXT(disp, glGenFramebuffersEXT);
-    SET_GenRenderbuffersEXT(disp, glGenRenderbuffersEXT);
-    SET_GetFramebufferAttachmentParameterivEXT(disp, glGetFramebufferAttachmentParameterivEXT);
-    SET_GetRenderbufferParameterivEXT(disp, glGetRenderbufferParameterivEXT);
-    SET_IsFramebufferEXT(disp, glIsFramebufferEXT);
-    SET_IsRenderbufferEXT(disp, glIsRenderbufferEXT);
-    SET_RenderbufferStorageEXT(disp, glRenderbufferStorageEXT);
-#endif
-
-#if GL_EXT_gpu_program_parameters
-    SET_ProgramEnvParameters4fvEXT(disp, glProgramEnvParameters4fvEXT);
-    SET_ProgramLocalParameters4fvEXT(disp, glProgramLocalParameters4fvEXT);
-#endif
-
-#if GL_EXT_multi_draw_arrays
-    /* Pointer Incompatability:
-     * This warning can be safely ignored.  OpenGL.framework adds const to the
-     * two pointers.
-     *
-     * extern void glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei);
-     *
-     * void ( * MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount);
-     */
-    SET_MultiDrawArraysEXT(disp, (void *)glMultiDrawArraysEXT);
-    SET_MultiDrawElementsEXT(disp, glMultiDrawElementsEXT);
-#endif
-
-#if GL_EXT_point_parameters
-    SET_PointParameterfEXT(disp, glPointParameterfEXT);
-    SET_PointParameterfvEXT(disp, glPointParameterfvEXT);
-#elif GL_ARB_point_parameters
-    SET_PointParameterfEXT(disp, glPointParameterfARB);
-    SET_PointParameterfvEXT(disp, glPointParameterfvARB);
-#endif
-
-#if GL_EXT_polygon_offset
-    SET_PolygonOffsetEXT(disp, glPolygonOffsetEXT);
-#endif
-
-#if GL_EXT_secondary_color
-    SET_SecondaryColor3bEXT(disp, glSecondaryColor3bEXT);
-    SET_SecondaryColor3bvEXT(disp, glSecondaryColor3bvEXT);
-    SET_SecondaryColor3dEXT(disp, glSecondaryColor3dEXT);
-    SET_SecondaryColor3dvEXT(disp, glSecondaryColor3dvEXT);
-    SET_SecondaryColor3fEXT(disp, glSecondaryColor3fEXT);
-    SET_SecondaryColor3fvEXT(disp, glSecondaryColor3fvEXT);
-    SET_SecondaryColor3iEXT(disp, glSecondaryColor3iEXT);
-    SET_SecondaryColor3ivEXT(disp, glSecondaryColor3ivEXT);
-    SET_SecondaryColor3sEXT(disp, glSecondaryColor3sEXT);
-    SET_SecondaryColor3svEXT(disp, glSecondaryColor3svEXT);
-    SET_SecondaryColor3ubEXT(disp, glSecondaryColor3ubEXT);
-    SET_SecondaryColor3ubvEXT(disp, glSecondaryColor3ubvEXT);
-    SET_SecondaryColor3uiEXT(disp, glSecondaryColor3uiEXT);
-    SET_SecondaryColor3uivEXT(disp, glSecondaryColor3uivEXT);
-    SET_SecondaryColor3usEXT(disp, glSecondaryColor3usEXT);
-    SET_SecondaryColor3usvEXT(disp, glSecondaryColor3usvEXT);
-    SET_SecondaryColorPointerEXT(disp, glSecondaryColorPointerEXT);
-#endif
-
-#if GL_EXT_stencil_two_side
-    SET_ActiveStencilFaceEXT(disp, glActiveStencilFaceEXT);
-#endif
-
-#if GL_EXT_timer_query
-    SET_GetQueryObjecti64vEXT(disp, glGetQueryObjecti64vEXT);
-    SET_GetQueryObjectui64vEXT(disp, glGetQueryObjectui64vEXT);
-#endif
-
-#if GL_EXT_vertex_array
-    SET_ColorPointerEXT(disp, glColorPointerEXT);
-    SET_EdgeFlagPointerEXT(disp, glEdgeFlagPointerEXT);
-    SET_IndexPointerEXT(disp, glIndexPointerEXT);
-    SET_NormalPointerEXT(disp, glNormalPointerEXT);
-    SET_TexCoordPointerEXT(disp, glTexCoordPointerEXT);
-    SET_VertexPointerEXT(disp, glVertexPointerEXT);
-#endif
-
-#if GL_IBM_multimode_draw_arrays
-    SET_MultiModeDrawArraysIBM(disp, glMultiModeDrawArraysIBM);
-    SET_MultiModeDrawElementsIBM(disp, glMultiModeDrawElementsIBM);
-#endif
-
-#if GL_MESA_resize_buffers
-    SET_ResizeBuffersMESA(disp, glResizeBuffersMESA);
-#endif
-
-#if GL_MESA_window_pos
-    SET_WindowPos4dMESA(disp, glWindowPos4dMESA);
-    SET_WindowPos4dvMESA(disp, glWindowPos4dvMESA);
-    SET_WindowPos4fMESA(disp, glWindowPos4fMESA);
-    SET_WindowPos4fvMESA(disp, glWindowPos4fvMESA);
-    SET_WindowPos4iMESA(disp, glWindowPos4iMESA);
-    SET_WindowPos4ivMESA(disp, glWindowPos4ivMESA);
-    SET_WindowPos4sMESA(disp, glWindowPos4sMESA);
-    SET_WindowPos4svMESA(disp, glWindowPos4svMESA);
-#endif
-
-#if GL_NV_fence
-    SET_DeleteFencesNV(disp, glDeleteFencesNV);
-    SET_FinishFenceNV(disp, glFinishFenceNV);
-    SET_GenFencesNV(disp, glGenFencesNV);
-    SET_GetFenceivNV(disp, glGetFenceivNV);
-    SET_IsFenceNV(disp, glIsFenceNV);
-    SET_SetFenceNV(disp, glSetFenceNV);
-    SET_TestFenceNV(disp, glTestFenceNV);
-#endif
-
-#if GL_NV_fragment_program
-    SET_GetProgramNamedParameterdvNV(disp, glGetProgramNamedParameterdvNV);
-    SET_GetProgramNamedParameterfvNV(disp, glGetProgramNamedParameterfvNV);
-    SET_ProgramNamedParameter4dNV(disp, glProgramNamedParameter4dNV);
-    SET_ProgramNamedParameter4dvNV(disp, glProgramNamedParameter4dvNV);
-    SET_ProgramNamedParameter4fNV(disp, glProgramNamedParameter4fNV);
-    SET_ProgramNamedParameter4fvNV(disp, glProgramNamedParameter4fvNV);
-#endif
-
-#if GL_NV_geometry_program4
-    SET_FramebufferTextureLayerEXT(disp, glFramebufferTextureLayerEXT);
-#endif
-
-#if GL_NV_point_sprite
-    SET_PointParameteriNV(disp, glPointParameteriNV);
-    SET_PointParameterivNV(disp, glPointParameterivNV);
-#endif
-
-#if GL_NV_register_combiners
-    SET_CombinerInputNV(disp, glCombinerInputNV);
-    SET_CombinerOutputNV(disp, glCombinerOutputNV);
-    SET_CombinerParameterfNV(disp, glCombinerParameterfNV);
-    SET_CombinerParameterfvNV(disp, glCombinerParameterfvNV);
-    SET_CombinerParameteriNV(disp, glCombinerParameteriNV);
-    SET_CombinerParameterivNV(disp, glCombinerParameterivNV);
-    SET_FinalCombinerInputNV(disp, glFinalCombinerInputNV);
-    SET_GetCombinerInputParameterfvNV(disp, glGetCombinerInputParameterfvNV);
-    SET_GetCombinerInputParameterivNV(disp, glGetCombinerInputParameterivNV);
-    SET_GetCombinerOutputParameterfvNV(disp, glGetCombinerOutputParameterfvNV);
-    SET_GetCombinerOutputParameterivNV(disp, glGetCombinerOutputParameterivNV);
-    SET_GetFinalCombinerInputParameterfvNV(disp, glGetFinalCombinerInputParameterfvNV);
-    SET_GetFinalCombinerInputParameterivNV(disp, glGetFinalCombinerInputParameterivNV);
-#endif
-
-#if GL_NV_vertex_array_range
-    SET_FlushVertexArrayRangeNV(disp, glFlushVertexArrayRangeNV);
-    SET_VertexArrayRangeNV(disp, glVertexArrayRangeNV);
-#endif
-
-#if GL_NV_vertex_program
-    SET_AreProgramsResidentNV(disp, glAreProgramsResidentNV);
-    SET_BindProgramNV(disp, glBindProgramNV);
-    SET_DeleteProgramsNV(disp, glDeleteProgramsNV);
-    SET_ExecuteProgramNV(disp, glExecuteProgramNV);
-    SET_GenProgramsNV(disp, glGenProgramsNV);
-    SET_GetProgramParameterdvNV(disp, glGetProgramParameterdvNV);
-    SET_GetProgramParameterfvNV(disp, glGetProgramParameterfvNV);
-    SET_GetProgramStringNV(disp, glGetProgramStringNV);
-    SET_GetProgramivNV(disp, glGetProgramivNV);
-    SET_GetTrackMatrixivNV(disp, glGetTrackMatrixivNV);
-    SET_GetVertexAttribPointervNV(disp, glGetVertexAttribPointervNV);
-    SET_GetVertexAttribdvNV(disp, glGetVertexAttribdvNV);
-    SET_GetVertexAttribfvNV(disp, glGetVertexAttribfvNV);
-    SET_GetVertexAttribivNV(disp, glGetVertexAttribivNV);
-    SET_IsProgramNV(disp, glIsProgramNV);
-    SET_LoadProgramNV(disp, glLoadProgramNV);
-    SET_ProgramParameters4dvNV(disp, glProgramParameters4dvNV);
-    SET_ProgramParameters4fvNV(disp, glProgramParameters4fvNV);
-    SET_RequestResidentProgramsNV(disp, glRequestResidentProgramsNV);
-    SET_TrackMatrixNV(disp, glTrackMatrixNV);
-    SET_VertexAttrib1dNV(disp, glVertexAttrib1dNV)
-    SET_VertexAttrib1dvNV(disp, glVertexAttrib1dvNV)
-    SET_VertexAttrib1fNV(disp, glVertexAttrib1fNV)
-    SET_VertexAttrib1fvNV(disp, glVertexAttrib1fvNV)
-    SET_VertexAttrib1sNV(disp, glVertexAttrib1sNV)
-    SET_VertexAttrib1svNV(disp, glVertexAttrib1svNV)
-    SET_VertexAttrib2dNV(disp, glVertexAttrib2dNV)
-    SET_VertexAttrib2dvNV(disp, glVertexAttrib2dvNV)
-    SET_VertexAttrib2fNV(disp, glVertexAttrib2fNV)
-    SET_VertexAttrib2fvNV(disp, glVertexAttrib2fvNV)
-    SET_VertexAttrib2sNV(disp, glVertexAttrib2sNV)
-    SET_VertexAttrib2svNV(disp, glVertexAttrib2svNV)
-    SET_VertexAttrib3dNV(disp, glVertexAttrib3dNV)
-    SET_VertexAttrib3dvNV(disp, glVertexAttrib3dvNV)
-    SET_VertexAttrib3fNV(disp, glVertexAttrib3fNV)
-    SET_VertexAttrib3fvNV(disp, glVertexAttrib3fvNV)
-    SET_VertexAttrib3sNV(disp, glVertexAttrib3sNV)
-    SET_VertexAttrib3svNV(disp, glVertexAttrib3svNV)
-    SET_VertexAttrib4dNV(disp, glVertexAttrib4dNV)
-    SET_VertexAttrib4dvNV(disp, glVertexAttrib4dvNV)
-    SET_VertexAttrib4fNV(disp, glVertexAttrib4fNV)
-    SET_VertexAttrib4fvNV(disp, glVertexAttrib4fvNV)
-    SET_VertexAttrib4sNV(disp, glVertexAttrib4sNV)
-    SET_VertexAttrib4svNV(disp, glVertexAttrib4svNV)
-    SET_VertexAttrib4ubNV(disp, glVertexAttrib4ubNV)
-    SET_VertexAttrib4ubvNV(disp, glVertexAttrib4ubvNV)
-    SET_VertexAttribPointerNV(disp, glVertexAttribPointerNV)
-    SET_VertexAttribs1dvNV(disp, glVertexAttribs1dvNV)
-    SET_VertexAttribs1fvNV(disp, glVertexAttribs1fvNV)
-    SET_VertexAttribs1svNV(disp, glVertexAttribs1svNV)
-    SET_VertexAttribs2dvNV(disp, glVertexAttribs2dvNV)
-    SET_VertexAttribs2fvNV(disp, glVertexAttribs2fvNV)
-    SET_VertexAttribs2svNV(disp, glVertexAttribs2svNV)
-    SET_VertexAttribs3dvNV(disp, glVertexAttribs3dvNV)
-    SET_VertexAttribs3fvNV(disp, glVertexAttribs3fvNV)
-    SET_VertexAttribs3svNV(disp, glVertexAttribs3svNV)
-    SET_VertexAttribs4dvNV(disp, glVertexAttribs4dvNV)
-    SET_VertexAttribs4fvNV(disp, glVertexAttribs4fvNV)
-    SET_VertexAttribs4svNV(disp, glVertexAttribs4svNV)
-    SET_VertexAttribs4ubvNV(disp, glVertexAttribs4ubvNV)
-#endif
-
-#if GL_SGIS_multisample
-    SET_SampleMaskSGIS(disp, glSampleMaskSGIS);
-    SET_SamplePatternSGIS(disp, glSamplePatternSGIS);
-#endif
-
-#if GL_SGIS_pixel_texture
-    SET_GetPixelTexGenParameterfvSGIS(disp, glGetPixelTexGenParameterfvSGIS);
-    SET_GetPixelTexGenParameterivSGIS(disp, glGetPixelTexGenParameterivSGIS);
-    SET_PixelTexGenParameterfSGIS(disp, glPixelTexGenParameterfSGIS);
-    SET_PixelTexGenParameterfvSGIS(disp, glPixelTexGenParameterfvSGIS);
-    SET_PixelTexGenParameteriSGIS(disp, glPixelTexGenParameteriSGIS);
-    SET_PixelTexGenParameterivSGIS(disp, glPixelTexGenParameterivSGIS);
-    SET_PixelTexGenSGIX(disp, glPixelTexGenSGIX);
-#endif
-}
+/*

+ * GLX implementation that uses Apple's OpenGL.framework

+ * (Indirect rendering path -- it's also used for some direct mode code too)

+ *

+ * Copyright (c) 2007, 2008, 2009 Apple Inc.

+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.

+ * Copyright (c) 2002 Greg Parker. All Rights Reserved.

+ *

+ * Portions of this file are copied from Mesa's xf86glx.c,

+ * which contains the following copyright:

+ *

+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "dri.h"

+

+#include <AvailabilityMacros.h>

+

+#define GL_GLEXT_WUNDEF_SUPPORT

+

+#include <OpenGL/OpenGL.h>

+#include <OpenGL/gl.h>

+#include <OpenGL/glext.h>

+#include <OpenGL/CGLContext.h>

+

+/* These next few GL_EXT pre-processing blocks are to explicitly define 

+ * these symbols to 0 if they are not set by OpenGL.framework.  This

+ * prevents the X11 glext.h from setting them to 1.

+ */

+

+#ifndef GL_EXT_fragment_shader

+#define GL_EXT_fragment_shader 0

+#endif

+

+#ifndef GL_EXT_blend_equation_separate

+#define GL_EXT_blend_equation_separate 0

+#endif

+

+#ifndef GL_EXT_blend_func_separate

+#define GL_EXT_blend_func_separate 0

+#endif

+

+#ifndef GL_EXT_depth_bounds_test

+#define GL_EXT_depth_bounds_test 0

+#endif

+

+#ifndef GL_EXT_compiled_vertex_array

+#define GL_EXT_compiled_vertex_array 0

+#endif

+

+#ifndef GL_EXT_cull_vertex

+#define GL_EXT_cull_vertex 0

+#endif

+

+#ifndef GL_EXT_fog_coord

+#define GL_EXT_fog_coord 0

+#endif

+

+#ifndef GL_EXT_framebuffer_blit

+#define GL_EXT_framebuffer_blit 0

+#endif

+

+#ifndef GL_EXT_framebuffer_object

+#define GL_EXT_framebuffer_object 0

+#endif

+

+#ifndef GL_EXT_gpu_program_parameters

+#define GL_EXT_gpu_program_parameters 0

+#endif

+

+#ifndef GL_EXT_multi_draw_arrays

+#define GL_EXT_multi_draw_arrays 0

+#endif

+

+#ifndef GL_EXT_point_parameters

+#define GL_EXT_point_parameters 0

+#endif

+

+#ifndef GL_EXT_polygon_offset

+#define GL_EXT_polygon_offset 0

+#endif

+

+#ifndef GL_EXT_secondary_color

+#define GL_EXT_secondary_color 0

+#endif

+

+#ifndef GL_EXT_stencil_two_side

+#define GL_EXT_stencil_two_side 0

+#endif

+

+#ifndef GL_EXT_timer_query

+#define GL_EXT_timer_query 0

+#endif

+

+#ifndef GL_EXT_vertex_array

+#define GL_EXT_vertex_array 0

+#endif

+

+/* Tiger PPC doesn't have the associated symbols, but glext.h says it does.  Liars!

+ * http://trac.macports.org/ticket/20638

+ */

+#if defined(__ppc__) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050

+#undef GL_EXT_gpu_program_parameters

+#define GL_EXT_gpu_program_parameters 0

+#endif

+

+#include <GL/glxproto.h>

+#include <windowstr.h>

+#include <resource.h>

+#include <GL/glxint.h>

+#include <GL/glxtokens.h>

+#include <scrnintstr.h>

+#include <glxserver.h>

+#include <glxscreens.h>

+#include <glxdrawable.h>

+#include <glxcontext.h>

+#include <glxext.h>

+#include <glxutil.h>

+#include <glxscreens.h>

+#include <GL/internal/glcore.h>

+#include "x-hash.h"

+#include "x-list.h"

+

+//#include "capabilities.h"

+#include "visualConfigs.h"

+

+typedef unsigned long long GLuint64EXT;

+typedef long long GLint64EXT;

+#include <dispatch.h>

+#include <Xplugin.h>

+#include <glapi.h>

+#include <glapitable.h>

+

+__GLXprovider * GlxGetDRISWrastProvider (void);

+

+// Write debugging output, or not

+#ifdef GLAQUA_DEBUG

+#define GLAQUA_DEBUG_MSG ErrorF

+#else

+#define GLAQUA_DEBUG_MSG(a, ...)

+#endif

+

+static void setup_dispatch_table(void);

+GLuint __glFloorLog2(GLuint val);

+void warn_func(void * p1, char *format, ...);

+

+// some prototypes

+static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);

+static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);

+

+static void __glXAquaContextDestroy(__GLXcontext *baseContext);

+static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);

+static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);

+static int __glXAquaContextForceCurrent(__GLXcontext *baseContext);

+static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);

+

+static CGLPixelFormatObj makeFormat(__GLXconfig *conf);

+

+__GLXprovider __glXDRISWRastProvider = {

+    __glXAquaScreenProbe,

+    "Core OpenGL",

+    NULL

+};

+

+typedef struct __GLXAquaScreen   __GLXAquaScreen;

+typedef struct __GLXAquaContext  __GLXAquaContext;

+typedef struct __GLXAquaDrawable __GLXAquaDrawable;

+

+struct __GLXAquaScreen {

+    __GLXscreen base;

+    int index;

+    int num_vis;

+};

+

+struct __GLXAquaContext {

+    __GLXcontext base;

+    CGLContextObj ctx;

+    CGLPixelFormatObj pixelFormat;

+    xp_surface_id sid;

+    unsigned isAttached :1;

+};

+

+struct __GLXAquaDrawable {

+    __GLXdrawable base;

+    DrawablePtr pDraw;

+    xp_surface_id sid;

+    __GLXAquaContext *context;

+};

+

+

+static __GLXcontext *

+__glXAquaScreenCreateContext(__GLXscreen *screen,

+			     __GLXconfig *conf,

+			     __GLXcontext *baseShareContext)

+{

+    __GLXAquaContext *context;

+    __GLXAquaContext *shareContext = (__GLXAquaContext *) baseShareContext;

+    CGLError gl_err;

+  

+    GLAQUA_DEBUG_MSG("glXAquaScreenCreateContext\n");

+    

+    context = xcalloc(1, sizeof (__GLXAquaContext));

+    

+    if (context == NULL)

+	return NULL;

+

+    memset(context, 0, sizeof *context);

+    

+    context->base.pGlxScreen = screen;

+    

+    context->base.destroy        = __glXAquaContextDestroy;

+    context->base.makeCurrent    = __glXAquaContextMakeCurrent;

+    context->base.loseCurrent    = __glXAquaContextLoseCurrent;

+    context->base.copy           = __glXAquaContextCopy;

+    context->base.forceCurrent   = __glXAquaContextForceCurrent;

+    /*FIXME verify that the context->base is fully initialized. */

+    

+    context->pixelFormat = makeFormat(conf);

+    

+    if (!context->pixelFormat) {

+        xfree(context);

+        return NULL;

+    }

+

+    context->ctx = NULL;

+    gl_err = CGLCreateContext(context->pixelFormat,

+			      shareContext ? shareContext->ctx : NULL,

+			      &context->ctx);

+    

+    if (gl_err != 0) {

+	ErrorF("CGLCreateContext error: %s\n", CGLErrorString(gl_err));

+	CGLDestroyPixelFormat(context->pixelFormat);

+	xfree(context);

+	return NULL;

+    }

+    

+    setup_dispatch_table();

+    GLAQUA_DEBUG_MSG("glAquaCreateContext done\n");

+    

+    return &context->base;

+}

+

+/* maps from surface id -> list of __GLcontext */

+static x_hash_table *surface_hash;

+

+static void __glXAquaContextDestroy(__GLXcontext *baseContext) {

+    x_list *lst;

+

+    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

+    

+    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n",

+                     (unsigned int) baseContext);

+    if (context != NULL) {

+      if (context->sid != 0 && surface_hash != NULL) {

+		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);

+		lst = x_list_remove(lst, context);

+		x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);

+      }

+

+      if (context->ctx != NULL)

+	  CGLDestroyContext(context->ctx);

+

+      if (context->pixelFormat != NULL)

+	  CGLDestroyPixelFormat(context->pixelFormat);

+      

+      xfree(context);

+    }

+}

+

+static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext) {

+    CGLError gl_err;

+

+    GLAQUA_DEBUG_MSG("glAquaLoseCurrent (ctx 0x%p)\n", baseContext);

+

+    gl_err = CGLSetCurrentContext(NULL);

+    if (gl_err != 0)

+      ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

+

+    __glXLastContext = NULL; // Mesa does this; why?

+

+    return GL_TRUE;

+}

+

+/* Called when a surface is destroyed as a side effect of destroying

+   the window it's attached to. */

+static void surface_notify(void *_arg, void *data) {

+    DRISurfaceNotifyArg *arg = (DRISurfaceNotifyArg *)_arg;

+    __GLXAquaDrawable *draw = (__GLXAquaDrawable *)data;

+    __GLXAquaContext *context;

+    x_list *lst;

+    if(_arg == NULL || data == NULL) {

+	    ErrorF("surface_notify called with bad params");

+	    return;

+    }

+	

+    GLAQUA_DEBUG_MSG("surface_notify(%p, %p)\n", _arg, data);

+    switch (arg->kind) {

+    case AppleDRISurfaceNotifyDestroyed:

+        if (surface_hash != NULL)

+            x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));

+	draw->base.pDraw = NULL;

+	draw->sid = 0;

+        break;

+

+    case AppleDRISurfaceNotifyChanged:

+        if (surface_hash != NULL) {

+            lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(arg->id), NULL);

+            for (; lst != NULL; lst = lst->next)

+		{

+                context = lst->data;

+                xp_update_gl_context(context->ctx);

+            }

+        }

+        break;

+    default:

+	ErrorF("surface_notify: unknown kind %d\n", arg->kind);

+	break;

+    }

+}

+

+static BOOL attach(__GLXAquaContext *context, __GLXAquaDrawable *draw) {

+    DrawablePtr pDraw;

+    

+    GLAQUA_DEBUG_MSG("attach(%p, %p)\n", context, draw);

+	

+    if(NULL == context || NULL == draw)

+	return TRUE;

+

+    pDraw = draw->base.pDraw;

+

+    if(NULL == pDraw) {

+	ErrorF("%s:%s() pDraw is NULL!\n", __FILE__, __func__);

+	return TRUE;

+    }

+

+    if (draw->sid == 0) {

+	//if (!quartzProcs->CreateSurface(pDraw->pScreen, pDraw->id, pDraw,

+        if (!DRICreateSurface(pDraw->pScreen, pDraw->id, pDraw,

+			      0, &draw->sid, NULL,

+			      surface_notify, draw))

+            return TRUE;

+        draw->pDraw = pDraw;

+    } 

+    

+    if (!context->isAttached || context->sid != draw->sid) {

+        x_list *lst;

+	

+        if (xp_attach_gl_context(context->ctx, draw->sid) != Success) {

+	    //quartzProcs->DestroySurface(pDraw->pScreen, pDraw->id, pDraw,

+            DRIDestroySurface(pDraw->pScreen, pDraw->id, pDraw,

+			      surface_notify, draw);

+            if (surface_hash != NULL)

+                x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(draw->sid));

+	    

+            draw->sid = 0;

+            return TRUE;

+        }

+	

+        context->isAttached = TRUE;

+        context->sid = draw->sid;

+	

+        if (surface_hash == NULL)

+            surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);

+	

+        lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);

+        if (x_list_find(lst, context) == NULL) {

+            lst = x_list_prepend(lst, context);

+            x_hash_table_insert(surface_hash, x_cvt_uint_to_vptr(context->sid), lst);

+        }

+	

+	

+

+        GLAQUA_DEBUG_MSG("attached 0x%x to 0x%x\n", (unsigned int) pDraw->id,

+                         (unsigned int) draw->sid);

+    } 

+

+    draw->context = context;

+

+    return FALSE;

+}

+

+#if 0     // unused

+static void unattach(__GLXAquaContext *context) {

+	x_list *lst;

+	GLAQUA_DEBUG_MSG("unattach\n");

+	if (context == NULL) {

+		ErrorF("Tried to unattach a null context\n");

+		return;

+	}

+    if (context->isAttached) {

+        GLAQUA_DEBUG_MSG("unattaching\n");

+

+        if (surface_hash != NULL) {

+            lst = x_hash_table_lookup(surface_hash, (void *) context->sid, NULL);

+            lst = x_list_remove(lst, context);

+            x_hash_table_insert(surface_hash, (void *) context->sid, lst);

+        }

+

+        CGLClearDrawable(context->ctx);

+        context->isAttached = FALSE;

+        context->sid = 0;

+    }

+}

+#endif

+

+static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext) {

+    CGLError gl_err;

+    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

+    __GLXAquaDrawable *drawPriv = (__GLXAquaDrawable *) context->base.drawPriv;

+    

+    GLAQUA_DEBUG_MSG("glAquaMakeCurrent (ctx 0x%p)\n", baseContext);

+    

+    if(attach(context, drawPriv))

+	return /*error*/ 0;

+

+    gl_err = CGLSetCurrentContext(context->ctx);

+    if (gl_err != 0)

+        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

+    

+    return gl_err == 0;

+}

+

+static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask)

+{

+    CGLError gl_err;

+

+    __GLXAquaContext *dst = (__GLXAquaContext *) baseDst;

+    __GLXAquaContext *src = (__GLXAquaContext *) baseSrc;

+

+    GLAQUA_DEBUG_MSG("GLXAquaContextCopy\n");

+

+    gl_err = CGLCopyContext(src->ctx, dst->ctx, mask);

+    if (gl_err != 0)

+        ErrorF("CGLCopyContext error: %s\n", CGLErrorString(gl_err));

+

+    return gl_err == 0;

+}

+

+static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)

+{

+    CGLError gl_err;

+    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

+    GLAQUA_DEBUG_MSG("glAquaForceCurrent (ctx %p)\n", context->ctx);

+

+    gl_err = CGLSetCurrentContext(context->ctx);

+    if (gl_err != 0)

+        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

+

+    return gl_err == 0;

+}

+

+/* Drawing surface notification callbacks */

+static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {

+    CGLError err;

+    __GLXAquaDrawable *drawable;

+ 

+    //    GLAQUA_DEBUG_MSG("glAquaDrawableSwapBuffers(%p)\n",base);

+	

+    if(!base) {

+	ErrorF("%s passed NULL\n", __func__);

+	return GL_FALSE;

+    }

+

+    drawable = (__GLXAquaDrawable *)base;

+

+    if(NULL == drawable->context) {

+	ErrorF("%s called with a NULL->context for drawable %p!\n",

+	       __func__, (void *)drawable);

+	return GL_FALSE;

+    }

+

+    err = CGLFlushDrawable(drawable->context->ctx);

+

+    if(kCGLNoError != err) {

+	ErrorF("CGLFlushDrawable error: %s in %s\n", CGLErrorString(err),

+	       __func__);

+	return GL_FALSE;

+    }

+

+    return GL_TRUE;

+}

+

+

+static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {

+    CGLPixelFormatAttribute attr[64];

+    CGLPixelFormatObj fobj;

+    GLint formats;

+    CGLError error;

+    int i = 0;

+    

+    if(conf->doubleBufferMode)

+	attr[i++] = kCGLPFADoubleBuffer;

+

+    if(conf->stereoMode)

+	attr[i++] = kCGLPFAStereo;

+

+    attr[i++] = kCGLPFAColorSize;

+    attr[i++] = conf->redBits + conf->greenBits + conf->blueBits;

+    attr[i++] = kCGLPFAAlphaSize;

+    attr[i++] = conf->alphaBits;

+

+    if((conf->accumRedBits + conf->accumGreenBits + conf->accumBlueBits +

+	conf->accumAlphaBits) > 0) {

+

+	attr[i++] = kCGLPFAAccumSize;

+        attr[i++] = conf->accumRedBits + conf->accumGreenBits

+	    + conf->accumBlueBits + conf->accumAlphaBits;

+    }

+    

+    attr[i++] = kCGLPFADepthSize;

+    attr[i++] = conf->depthBits;

+

+    if(conf->stencilBits) {

+	attr[i++] = kCGLPFAStencilSize;

+        attr[i++] = conf->stencilBits;	

+    }

+    

+    if(conf->numAuxBuffers > 0) {

+	attr[i++] = kCGLPFAAuxBuffers;

+	attr[i++] = conf->numAuxBuffers;

+    }

+

+    if(conf->sampleBuffers > 0) {

+       attr[i++] = kCGLPFASampleBuffers;

+       attr[i++] = conf->sampleBuffers;

+       attr[i++] = kCGLPFASamples;

+       attr[i++] = conf->samples;

+    }

+     

+    attr[i] = 0;

+

+    error = CGLChoosePixelFormat(attr, &fobj, &formats);

+    if(error) {

+	ErrorF("error: creating pixel format %s\n", CGLErrorString(error));

+	return NULL;

+    }

+

+    return fobj;

+}

+

+static void __glXAquaScreenDestroy(__GLXscreen *screen) {

+

+    GLAQUA_DEBUG_MSG("glXAquaScreenDestroy(%p)\n", screen);

+    __glXScreenDestroy(screen);

+

+    xfree(screen);

+}

+

+/* This is called by __glXInitScreens(). */

+static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {

+    __GLXAquaScreen *screen;

+

+    GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");

+

+    if (pScreen == NULL) 

+	return NULL;

+

+    screen = xcalloc(1, sizeof *screen);

+

+    if(NULL == screen)

+	return NULL;

+    

+    screen->base.destroy        = __glXAquaScreenDestroy;

+    screen->base.createContext  = __glXAquaScreenCreateContext;

+    screen->base.createDrawable = __glXAquaScreenCreateDrawable;

+    screen->base.swapInterval = /*FIXME*/ NULL;

+    screen->base.hyperpipeFuncs = NULL;

+    screen->base.swapBarrierFuncs = NULL;

+    screen->base.pScreen       = pScreen;

+    

+    screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);

+

+    __glXScreenInit(&screen->base, pScreen);

+

+    screen->base.GLXversion = xstrdup("1.4");

+    screen->base.GLXextensions = xstrdup("GLX_SGIX_fbconfig "

+					 "GLX_SGIS_multisample "

+					 "GLX_ARB_multisample "

+					 "GLX_EXT_visual_info "

+					 "GLX_EXT_import_context ");

+    

+    /*We may be able to add more GLXextensions at a later time. */

+    

+    return &screen->base;

+}

+

+#if 0 // unused

+static void __glXAquaDrawableCopySubBuffer (__GLXdrawable *drawable,

+					    int x, int y, int w, int h) {

+    /*TODO finish me*/

+}

+#endif

+

+static void __glXAquaDrawableDestroy(__GLXdrawable *base) {

+    /* gstaplin: base is the head of the structure, so it's at the same 

+     * offset in memory.

+     * Is this safe with strict aliasing?   I noticed that the other dri code

+     * does this too...

+     */

+    __GLXAquaDrawable *glxPriv = (__GLXAquaDrawable *)base;

+

+    GLAQUA_DEBUG_MSG(__func__);

+    

+    /* It doesn't work to call DRIDestroySurface here, the drawable's

+       already gone.. But dri.c notices the window destruction and

+       frees the surface itself. */

+

+    /*gstaplin: verify the statement above.  The surface destroy

+     *messages weren't making it through, and may still not be.

+     *We need a good test case for surface creation and destruction.

+     *We also need a good way to enable introspection on the server

+     *to validate the test, beyond using gdb with print.

+     */

+

+    xfree(glxPriv);

+}

+

+static __GLXdrawable *

+__glXAquaScreenCreateDrawable(ClientPtr client,

+                              __GLXscreen *screen,

+			      DrawablePtr pDraw,

+			      XID drawId,

+			      int type,

+			      XID glxDrawId,

+			      __GLXconfig *conf) {

+  __GLXAquaDrawable *glxPriv;

+

+  glxPriv = xalloc(sizeof *glxPriv);

+

+  if(glxPriv == NULL)

+      return NULL;

+

+  memset(glxPriv, 0, sizeof *glxPriv);

+

+  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {

+    xfree(glxPriv);

+    return NULL;

+  }

+

+  glxPriv->base.destroy       = __glXAquaDrawableDestroy;

+  glxPriv->base.swapBuffers   = __glXAquaDrawableSwapBuffers;

+  glxPriv->base.copySubBuffer = NULL; /* __glXAquaDrawableCopySubBuffer; */

+

+  glxPriv->pDraw = pDraw;

+  glxPriv->sid = 0;

+  glxPriv->context = NULL;

+  

+  return &glxPriv->base;

+}

+

+// Extra goodies for glx

+

+GLuint __glFloorLog2(GLuint val)

+{

+    int c = 0;

+

+    while (val > 1) {

+        c++;

+        val >>= 1;

+    }

+    return c;

+}

+

+void warn_func(void * p1, char *format, ...) {

+    va_list v;

+    va_start(v, format);

+    vfprintf(stderr, format, v);

+    va_end(v);

+}

+

+static void setup_dispatch_table(void) {

+    struct _glapi_table *disp=_glapi_get_dispatch();

+    _glapi_set_warning_func((_glapi_warning_func)warn_func);

+    _glapi_noop_enable_warnings(TRUE);

+

+    /* to update:

+     * for f in $(grep 'define SET_' ../../../glx/dispatch.h  | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy

+     */

+

+    SET_Accum(disp, glAccum);

+    SET_AlphaFunc(disp, glAlphaFunc);

+    SET_AreTexturesResident(disp, glAreTexturesResident);

+    SET_ArrayElement(disp, glArrayElement);

+    SET_Begin(disp, glBegin);

+    SET_BindTexture(disp, glBindTexture);

+    SET_Bitmap(disp, glBitmap);

+    SET_BlendColor(disp, glBlendColor);

+    SET_BlendEquation(disp, glBlendEquation);

+    SET_BlendFunc(disp, glBlendFunc);

+    SET_CallList(disp, glCallList);

+    SET_CallLists(disp, glCallLists);

+    SET_Clear(disp, glClear);

+    SET_ClearAccum(disp, glClearAccum);

+    SET_ClearColor(disp, glClearColor);

+    SET_ClearDepth(disp, glClearDepth);

+    SET_ClearIndex(disp, glClearIndex);

+    SET_ClearStencil(disp, glClearStencil);

+    SET_ClipPlane(disp, glClipPlane);

+    SET_Color3b(disp, glColor3b);

+    SET_Color3bv(disp, glColor3bv);

+    SET_Color3d(disp, glColor3d);

+    SET_Color3dv(disp, glColor3dv);

+    SET_Color3f(disp, glColor3f);

+    SET_Color3fv(disp, glColor3fv);

+    SET_Color3i(disp, glColor3i);

+    SET_Color3iv(disp, glColor3iv);

+    SET_Color3s(disp, glColor3s);

+    SET_Color3sv(disp, glColor3sv);

+    SET_Color3ub(disp, glColor3ub);

+    SET_Color3ubv(disp, glColor3ubv);

+    SET_Color3ui(disp, glColor3ui);

+    SET_Color3uiv(disp, glColor3uiv);

+    SET_Color3us(disp, glColor3us);

+    SET_Color3usv(disp, glColor3usv);

+    SET_Color4b(disp, glColor4b);

+    SET_Color4bv(disp, glColor4bv);

+    SET_Color4d(disp, glColor4d);

+    SET_Color4dv(disp, glColor4dv);

+    SET_Color4f(disp, glColor4f);

+    SET_Color4fv(disp, glColor4fv);

+    SET_Color4i(disp, glColor4i);

+    SET_Color4iv(disp, glColor4iv);

+    SET_Color4s(disp, glColor4s);

+    SET_Color4sv(disp, glColor4sv);

+    SET_Color4ub(disp, glColor4ub);

+    SET_Color4ubv(disp, glColor4ubv);

+    SET_Color4ui(disp, glColor4ui);

+    SET_Color4uiv(disp, glColor4uiv);

+    SET_Color4us(disp, glColor4us);

+    SET_Color4usv(disp, glColor4usv);

+    SET_ColorMask(disp, glColorMask);

+    SET_ColorMaterial(disp, glColorMaterial);

+    SET_ColorPointer(disp, glColorPointer);

+    SET_ColorSubTable(disp, glColorSubTable);

+    SET_ColorTable(disp, glColorTable);

+    SET_ColorTableParameterfv(disp, glColorTableParameterfv);

+    SET_ColorTableParameteriv(disp, glColorTableParameteriv);

+    SET_ConvolutionFilter1D(disp, glConvolutionFilter1D);

+    SET_ConvolutionFilter2D(disp, glConvolutionFilter2D);

+    SET_ConvolutionParameterf(disp, glConvolutionParameterf);

+    SET_ConvolutionParameterfv(disp, glConvolutionParameterfv);

+    SET_ConvolutionParameteri(disp, glConvolutionParameteri);

+    SET_ConvolutionParameteriv(disp, glConvolutionParameteriv);

+    SET_CopyColorSubTable(disp, glCopyColorSubTable);

+    SET_CopyColorTable(disp, glCopyColorTable);

+    SET_CopyConvolutionFilter1D(disp, glCopyConvolutionFilter1D);

+    SET_CopyConvolutionFilter2D(disp, glCopyConvolutionFilter2D);

+    SET_CopyPixels(disp, glCopyPixels);

+    SET_CopyTexImage1D(disp, glCopyTexImage1D);

+    SET_CopyTexImage2D(disp, glCopyTexImage2D);

+    SET_CopyTexSubImage1D(disp, glCopyTexSubImage1D);

+    SET_CopyTexSubImage2D(disp, glCopyTexSubImage2D);

+    SET_CopyTexSubImage3D(disp, glCopyTexSubImage3D);

+    SET_CullFace(disp, glCullFace);

+    SET_DeleteLists(disp, glDeleteLists);

+    SET_DeleteTextures(disp, glDeleteTextures);

+    SET_DepthFunc(disp, glDepthFunc);

+    SET_DepthMask(disp, glDepthMask);

+    SET_DepthRange(disp, glDepthRange);

+    SET_Disable(disp, glDisable);

+    SET_DisableClientState(disp, glDisableClientState);

+    SET_DrawArrays(disp, glDrawArrays);

+    SET_DrawBuffer(disp, glDrawBuffer);

+    SET_DrawElements(disp, glDrawElements);

+    SET_DrawPixels(disp, glDrawPixels);

+    SET_DrawRangeElements(disp, glDrawRangeElements);

+    SET_EdgeFlag(disp, glEdgeFlag);

+    SET_EdgeFlagPointer(disp, glEdgeFlagPointer);

+    SET_EdgeFlagv(disp, glEdgeFlagv);

+    SET_Enable(disp, glEnable);

+    SET_EnableClientState(disp, glEnableClientState);

+    SET_End(disp, glEnd);

+    SET_EndList(disp, glEndList);

+    SET_EvalCoord1d(disp, glEvalCoord1d);

+    SET_EvalCoord1dv(disp, glEvalCoord1dv);

+    SET_EvalCoord1f(disp, glEvalCoord1f);

+    SET_EvalCoord1fv(disp, glEvalCoord1fv);

+    SET_EvalCoord2d(disp, glEvalCoord2d);

+    SET_EvalCoord2dv(disp, glEvalCoord2dv);

+    SET_EvalCoord2f(disp, glEvalCoord2f);

+    SET_EvalCoord2fv(disp, glEvalCoord2fv);

+    SET_EvalMesh1(disp, glEvalMesh1);

+    SET_EvalMesh2(disp, glEvalMesh2);

+    SET_EvalPoint1(disp, glEvalPoint1);

+    SET_EvalPoint2(disp, glEvalPoint2);

+    SET_FeedbackBuffer(disp, glFeedbackBuffer);

+    SET_Finish(disp, glFinish);

+    SET_Flush(disp, glFlush);

+    SET_Fogf(disp, glFogf);

+    SET_Fogfv(disp, glFogfv);

+    SET_Fogi(disp, glFogi);

+    SET_Fogiv(disp, glFogiv);

+    SET_FrontFace(disp, glFrontFace);

+    SET_Frustum(disp, glFrustum);

+    SET_GenLists(disp, glGenLists);

+    SET_GenTextures(disp, glGenTextures);

+    SET_GetBooleanv(disp, glGetBooleanv);

+    SET_GetClipPlane(disp, glGetClipPlane);

+    SET_GetColorTable(disp, glGetColorTable);

+    SET_GetColorTableParameterfv(disp, glGetColorTableParameterfv);

+    SET_GetColorTableParameteriv(disp, glGetColorTableParameteriv);

+    SET_GetConvolutionFilter(disp, glGetConvolutionFilter);

+    SET_GetConvolutionParameterfv(disp, glGetConvolutionParameterfv);

+    SET_GetConvolutionParameteriv(disp, glGetConvolutionParameteriv);

+    SET_GetDoublev(disp, glGetDoublev);

+    SET_GetError(disp, glGetError);

+    SET_GetFloatv(disp, glGetFloatv);

+    SET_GetHistogram(disp, glGetHistogram);

+    SET_GetHistogramParameterfv(disp, glGetHistogramParameterfv);

+    SET_GetHistogramParameteriv(disp, glGetHistogramParameteriv);

+    SET_GetIntegerv(disp, glGetIntegerv);

+    SET_GetLightfv(disp, glGetLightfv);

+    SET_GetLightiv(disp, glGetLightiv);

+    SET_GetMapdv(disp, glGetMapdv);

+    SET_GetMapfv(disp, glGetMapfv);

+    SET_GetMapiv(disp, glGetMapiv);

+    SET_GetMaterialfv(disp, glGetMaterialfv);

+    SET_GetMaterialiv(disp, glGetMaterialiv);

+    SET_GetMinmax(disp, glGetMinmax);

+    SET_GetMinmaxParameterfv(disp, glGetMinmaxParameterfv);

+    SET_GetMinmaxParameteriv(disp, glGetMinmaxParameteriv);

+    SET_GetPixelMapfv(disp, glGetPixelMapfv);

+    SET_GetPixelMapuiv(disp, glGetPixelMapuiv);

+    SET_GetPixelMapusv(disp, glGetPixelMapusv);

+    SET_GetPointerv(disp, glGetPointerv);

+    SET_GetPolygonStipple(disp, glGetPolygonStipple);

+    SET_GetSeparableFilter(disp, glGetSeparableFilter);

+    SET_GetString(disp, glGetString);

+    SET_GetTexEnvfv(disp, glGetTexEnvfv);

+    SET_GetTexEnviv(disp, glGetTexEnviv);

+    SET_GetTexGendv(disp, glGetTexGendv);

+    SET_GetTexGenfv(disp, glGetTexGenfv);

+    SET_GetTexGeniv(disp, glGetTexGeniv);

+    SET_GetTexImage(disp, glGetTexImage);

+    SET_GetTexLevelParameterfv(disp, glGetTexLevelParameterfv);

+    SET_GetTexLevelParameteriv(disp, glGetTexLevelParameteriv);

+    SET_GetTexParameterfv(disp, glGetTexParameterfv);

+    SET_GetTexParameteriv(disp, glGetTexParameteriv);

+    SET_Hint(disp, glHint);

+    SET_Histogram(disp, glHistogram);

+    SET_IndexMask(disp, glIndexMask);

+    SET_IndexPointer(disp, glIndexPointer);

+    SET_Indexd(disp, glIndexd);

+    SET_Indexdv(disp, glIndexdv);

+    SET_Indexf(disp, glIndexf);

+    SET_Indexfv(disp, glIndexfv);

+    SET_Indexi(disp, glIndexi);

+    SET_Indexiv(disp, glIndexiv);

+    SET_Indexs(disp, glIndexs);

+    SET_Indexsv(disp, glIndexsv);

+    SET_Indexub(disp, glIndexub);

+    SET_Indexubv(disp, glIndexubv);

+    SET_InitNames(disp, glInitNames);

+    SET_InterleavedArrays(disp, glInterleavedArrays);

+    SET_IsEnabled(disp, glIsEnabled);

+    SET_IsList(disp, glIsList);

+    SET_IsTexture(disp, glIsTexture);

+    SET_LightModelf(disp, glLightModelf);

+    SET_LightModelfv(disp, glLightModelfv);

+    SET_LightModeli(disp, glLightModeli);

+    SET_LightModeliv(disp, glLightModeliv);

+    SET_Lightf(disp, glLightf);

+    SET_Lightfv(disp, glLightfv);

+    SET_Lighti(disp, glLighti);

+    SET_Lightiv(disp, glLightiv);

+    SET_LineStipple(disp, glLineStipple);

+    SET_LineWidth(disp, glLineWidth);

+    SET_ListBase(disp, glListBase);

+    SET_LoadIdentity(disp, glLoadIdentity);

+    SET_LoadMatrixd(disp, glLoadMatrixd);

+    SET_LoadMatrixf(disp, glLoadMatrixf);

+    SET_LoadName(disp, glLoadName);

+    SET_LogicOp(disp, glLogicOp);

+    SET_Map1d(disp, glMap1d);

+    SET_Map1f(disp, glMap1f);

+    SET_Map2d(disp, glMap2d);

+    SET_Map2f(disp, glMap2f);

+    SET_MapGrid1d(disp, glMapGrid1d);

+    SET_MapGrid1f(disp, glMapGrid1f);

+    SET_MapGrid2d(disp, glMapGrid2d);

+    SET_MapGrid2f(disp, glMapGrid2f);

+    SET_Materialf(disp, glMaterialf);

+    SET_Materialfv(disp, glMaterialfv);

+    SET_Materiali(disp, glMateriali);

+    SET_Materialiv(disp, glMaterialiv);

+    SET_MatrixMode(disp, glMatrixMode);

+    SET_Minmax(disp, glMinmax);

+    SET_MultMatrixd(disp, glMultMatrixd);

+    SET_MultMatrixf(disp, glMultMatrixf);

+    SET_NewList(disp, glNewList);

+    SET_Normal3b(disp, glNormal3b);

+    SET_Normal3bv(disp, glNormal3bv);

+    SET_Normal3d(disp, glNormal3d);

+    SET_Normal3dv(disp, glNormal3dv);

+    SET_Normal3f(disp, glNormal3f);

+    SET_Normal3fv(disp, glNormal3fv);

+    SET_Normal3i(disp, glNormal3i);

+    SET_Normal3iv(disp, glNormal3iv);

+    SET_Normal3s(disp, glNormal3s);

+    SET_Normal3sv(disp, glNormal3sv);

+    SET_NormalPointer(disp, glNormalPointer);

+    SET_Ortho(disp, glOrtho);

+    SET_PassThrough(disp, glPassThrough);

+    SET_PixelMapfv(disp, glPixelMapfv);

+    SET_PixelMapuiv(disp, glPixelMapuiv);

+    SET_PixelMapusv(disp, glPixelMapusv);

+    SET_PixelStoref(disp, glPixelStoref);

+    SET_PixelStorei(disp, glPixelStorei);

+    SET_PixelTransferf(disp, glPixelTransferf);

+    SET_PixelTransferi(disp, glPixelTransferi);

+    SET_PixelZoom(disp, glPixelZoom);

+    SET_PointSize(disp, glPointSize);

+    SET_PolygonMode(disp, glPolygonMode);

+    SET_PolygonOffset(disp, glPolygonOffset);

+    SET_PolygonStipple(disp, glPolygonStipple);

+    SET_PopAttrib(disp, glPopAttrib);

+    SET_PopClientAttrib(disp, glPopClientAttrib);

+    SET_PopMatrix(disp, glPopMatrix);

+    SET_PopName(disp, glPopName);

+    SET_PrioritizeTextures(disp, glPrioritizeTextures);

+    SET_PushAttrib(disp, glPushAttrib);

+    SET_PushClientAttrib(disp, glPushClientAttrib);

+    SET_PushMatrix(disp, glPushMatrix);

+    SET_PushName(disp, glPushName);

+    SET_RasterPos2d(disp, glRasterPos2d);

+    SET_RasterPos2dv(disp, glRasterPos2dv);

+    SET_RasterPos2f(disp, glRasterPos2f);

+    SET_RasterPos2fv(disp, glRasterPos2fv);

+    SET_RasterPos2i(disp, glRasterPos2i);

+    SET_RasterPos2iv(disp, glRasterPos2iv);

+    SET_RasterPos2s(disp, glRasterPos2s);

+    SET_RasterPos2sv(disp, glRasterPos2sv);

+    SET_RasterPos3d(disp, glRasterPos3d);

+    SET_RasterPos3dv(disp, glRasterPos3dv);

+    SET_RasterPos3f(disp, glRasterPos3f);

+    SET_RasterPos3fv(disp, glRasterPos3fv);

+    SET_RasterPos3i(disp, glRasterPos3i);

+    SET_RasterPos3iv(disp, glRasterPos3iv);

+    SET_RasterPos3s(disp, glRasterPos3s);

+    SET_RasterPos3sv(disp, glRasterPos3sv);

+    SET_RasterPos4d(disp, glRasterPos4d);

+    SET_RasterPos4dv(disp, glRasterPos4dv);

+    SET_RasterPos4f(disp, glRasterPos4f);

+    SET_RasterPos4fv(disp, glRasterPos4fv);

+    SET_RasterPos4i(disp, glRasterPos4i);

+    SET_RasterPos4iv(disp, glRasterPos4iv);

+    SET_RasterPos4s(disp, glRasterPos4s);

+    SET_RasterPos4sv(disp, glRasterPos4sv);

+    SET_ReadBuffer(disp, glReadBuffer);

+    SET_ReadPixels(disp, glReadPixels);

+    SET_Rectd(disp, glRectd);

+    SET_Rectdv(disp, glRectdv);

+    SET_Rectf(disp, glRectf);

+    SET_Rectfv(disp, glRectfv);

+    SET_Recti(disp, glRecti);

+    SET_Rectiv(disp, glRectiv);

+    SET_Rects(disp, glRects);

+    SET_Rectsv(disp, glRectsv);

+    SET_RenderMode(disp, glRenderMode);

+    SET_ResetHistogram(disp, glResetHistogram);

+    SET_ResetMinmax(disp, glResetMinmax);

+    SET_Rotated(disp, glRotated);

+    SET_Rotatef(disp, glRotatef);

+    SET_Scaled(disp, glScaled);

+    SET_Scalef(disp, glScalef);

+    SET_Scissor(disp, glScissor);

+    SET_SelectBuffer(disp, glSelectBuffer);

+    SET_SeparableFilter2D(disp, glSeparableFilter2D);

+    SET_ShadeModel(disp, glShadeModel);

+    SET_StencilFunc(disp, glStencilFunc);

+    SET_StencilMask(disp, glStencilMask);

+    SET_StencilOp(disp, glStencilOp);

+    SET_TexCoord1d(disp, glTexCoord1d);

+    SET_TexCoord1dv(disp, glTexCoord1dv);

+    SET_TexCoord1f(disp, glTexCoord1f);

+    SET_TexCoord1fv(disp, glTexCoord1fv);

+    SET_TexCoord1i(disp, glTexCoord1i);

+    SET_TexCoord1iv(disp, glTexCoord1iv);

+    SET_TexCoord1s(disp, glTexCoord1s);

+    SET_TexCoord1sv(disp, glTexCoord1sv);

+    SET_TexCoord2d(disp, glTexCoord2d);

+    SET_TexCoord2dv(disp, glTexCoord2dv);

+    SET_TexCoord2f(disp, glTexCoord2f);

+    SET_TexCoord2fv(disp, glTexCoord2fv);

+    SET_TexCoord2i(disp, glTexCoord2i);

+    SET_TexCoord2iv(disp, glTexCoord2iv);

+    SET_TexCoord2s(disp, glTexCoord2s);

+    SET_TexCoord2sv(disp, glTexCoord2sv);

+    SET_TexCoord3d(disp, glTexCoord3d);

+    SET_TexCoord3dv(disp, glTexCoord3dv);

+    SET_TexCoord3f(disp, glTexCoord3f);

+    SET_TexCoord3fv(disp, glTexCoord3fv);

+    SET_TexCoord3i(disp, glTexCoord3i);

+    SET_TexCoord3iv(disp, glTexCoord3iv);

+    SET_TexCoord3s(disp, glTexCoord3s);

+    SET_TexCoord3sv(disp, glTexCoord3sv);

+    SET_TexCoord4d(disp, glTexCoord4d);

+    SET_TexCoord4dv(disp, glTexCoord4dv);

+    SET_TexCoord4f(disp, glTexCoord4f);

+    SET_TexCoord4fv(disp, glTexCoord4fv);

+    SET_TexCoord4i(disp, glTexCoord4i);

+    SET_TexCoord4iv(disp, glTexCoord4iv);

+    SET_TexCoord4s(disp, glTexCoord4s);

+    SET_TexCoord4sv(disp, glTexCoord4sv);

+    SET_TexCoordPointer(disp, glTexCoordPointer);

+    SET_TexEnvf(disp, glTexEnvf);

+    SET_TexEnvfv(disp, glTexEnvfv);

+    SET_TexEnvi(disp, glTexEnvi);

+    SET_TexEnviv(disp, glTexEnviv);

+    SET_TexGend(disp, glTexGend);

+    SET_TexGendv(disp, glTexGendv);

+    SET_TexGenf(disp, glTexGenf);

+    SET_TexGenfv(disp, glTexGenfv);

+    SET_TexGeni(disp, glTexGeni);

+    SET_TexGeniv(disp, glTexGeniv);

+    

+    /* Pointer Incompatability:

+     * internalformat is a GLenum according to /System/Library/Frameworks/OpenGL.framework/Headers/gl.h

+     * extern void glTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);

+     * extern void glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);

+     * extern void glTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);

+     *

+     * and it's a GLint in glx/glapitable.h and according to the man page

+     * void ( * TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);

+     * void ( * TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);

+     * void ( * TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);

+     *

+     * <rdar://problem/6953344> gl.h contains incorrect prototypes for glTexImage[123]D

+     */

+    

+    SET_TexImage1D(disp, (void *)glTexImage1D);

+    SET_TexImage2D(disp, (void *)glTexImage2D);

+    SET_TexImage3D(disp, (void *)glTexImage3D);

+    SET_TexParameterf(disp, glTexParameterf);

+    SET_TexParameterfv(disp, glTexParameterfv);

+    SET_TexParameteri(disp, glTexParameteri);

+    SET_TexParameteriv(disp, glTexParameteriv);

+    SET_TexSubImage1D(disp, glTexSubImage1D);

+    SET_TexSubImage2D(disp, glTexSubImage2D);

+    SET_TexSubImage3D(disp, glTexSubImage3D);

+    SET_Translated(disp, glTranslated);

+    SET_Translatef(disp, glTranslatef);

+    SET_Vertex2d(disp, glVertex2d);

+    SET_Vertex2dv(disp, glVertex2dv);

+    SET_Vertex2f(disp, glVertex2f);

+    SET_Vertex2fv(disp, glVertex2fv);

+    SET_Vertex2i(disp, glVertex2i);

+    SET_Vertex2iv(disp, glVertex2iv);

+    SET_Vertex2s(disp, glVertex2s);

+    SET_Vertex2sv(disp, glVertex2sv);

+    SET_Vertex3d(disp, glVertex3d);

+    SET_Vertex3dv(disp, glVertex3dv);

+    SET_Vertex3f(disp, glVertex3f);

+    SET_Vertex3fv(disp, glVertex3fv);

+    SET_Vertex3i(disp, glVertex3i);

+    SET_Vertex3iv(disp, glVertex3iv);

+    SET_Vertex3s(disp, glVertex3s);

+    SET_Vertex3sv(disp, glVertex3sv);

+    SET_Vertex4d(disp, glVertex4d);

+    SET_Vertex4dv(disp, glVertex4dv);

+    SET_Vertex4f(disp, glVertex4f);

+    SET_Vertex4fv(disp, glVertex4fv);

+    SET_Vertex4i(disp, glVertex4i);

+    SET_Vertex4iv(disp, glVertex4iv);

+    SET_Vertex4s(disp, glVertex4s);

+    SET_Vertex4sv(disp, glVertex4sv);

+    SET_VertexPointer(disp, glVertexPointer);

+    SET_Viewport(disp, glViewport);

+

+#if GL_VERSION_2_0

+    SET_AttachShader(disp, glAttachShader);

+    SET_DeleteShader(disp, glDeleteShader);

+    SET_DetachShader(disp, glDetachShader);

+    SET_GetAttachedShaders(disp, glGetAttachedShaders);

+    SET_GetProgramInfoLog(disp, glGetProgramInfoLog);

+    SET_GetShaderInfoLog(disp, glGetShaderInfoLog);

+    SET_GetShaderiv(disp, glGetShaderiv);

+    SET_IsShader(disp, glIsShader);

+    SET_StencilFuncSeparate(disp, glStencilFuncSeparate);

+    SET_StencilMaskSeparate(disp, glStencilMaskSeparate);

+    SET_StencilOpSeparate(disp, glStencilOpSeparate);

+#endif

+

+#if GL_VERSION_2_1

+    SET_UniformMatrix2x3fv(disp, glUniformMatrix2x3fv);

+    SET_UniformMatrix2x4fv(disp, glUniformMatrix2x4fv);

+    SET_UniformMatrix3x2fv(disp, glUniformMatrix3x2fv);

+    SET_UniformMatrix3x4fv(disp, glUniformMatrix3x4fv);

+    SET_UniformMatrix4x2fv(disp, glUniformMatrix4x2fv);

+    SET_UniformMatrix4x3fv(disp, glUniformMatrix4x3fv);

+#endif

+

+#if GL_APPLE_vertex_array_object

+    SET_BindVertexArrayAPPLE(disp, glBindVertexArrayAPPLE);

+    SET_DeleteVertexArraysAPPLE(disp, glDeleteVertexArraysAPPLE);

+    SET_GenVertexArraysAPPLE(disp, glGenVertexArraysAPPLE);

+    SET_IsVertexArrayAPPLE(disp, glIsVertexArrayAPPLE);

+#endif

+

+#if GL_ARB_draw_buffers

+    SET_DrawBuffersARB(disp, glDrawBuffersARB);

+#endif

+

+#if GL_ARB_multisample

+    SET_SampleCoverageARB(disp, glSampleCoverageARB);

+#endif

+

+#if GL_ARB_multitexture

+    SET_ActiveTextureARB(disp, glActiveTextureARB);

+    SET_ClientActiveTextureARB(disp, glClientActiveTextureARB);

+    SET_MultiTexCoord1dARB(disp, glMultiTexCoord1dARB);

+    SET_MultiTexCoord1dvARB(disp, glMultiTexCoord1dvARB);

+    SET_MultiTexCoord1fARB(disp, glMultiTexCoord1fARB);

+    SET_MultiTexCoord1fvARB(disp, glMultiTexCoord1fvARB);

+    SET_MultiTexCoord1iARB(disp, glMultiTexCoord1iARB);

+    SET_MultiTexCoord1ivARB(disp, glMultiTexCoord1ivARB);

+    SET_MultiTexCoord1sARB(disp, glMultiTexCoord1sARB);

+    SET_MultiTexCoord1svARB(disp, glMultiTexCoord1svARB);

+    SET_MultiTexCoord2dARB(disp, glMultiTexCoord2dARB);

+    SET_MultiTexCoord2dvARB(disp, glMultiTexCoord2dvARB);

+    SET_MultiTexCoord2fARB(disp, glMultiTexCoord2fARB);

+    SET_MultiTexCoord2fvARB(disp, glMultiTexCoord2fvARB);

+    SET_MultiTexCoord2iARB(disp, glMultiTexCoord2iARB);

+    SET_MultiTexCoord2ivARB(disp, glMultiTexCoord2ivARB);

+    SET_MultiTexCoord2sARB(disp, glMultiTexCoord2sARB);

+    SET_MultiTexCoord2svARB(disp, glMultiTexCoord2svARB);

+    SET_MultiTexCoord3dARB(disp, glMultiTexCoord3dARB);

+    SET_MultiTexCoord3dvARB(disp, glMultiTexCoord3dvARB);

+    SET_MultiTexCoord3fARB(disp, glMultiTexCoord3fARB);

+    SET_MultiTexCoord3fvARB(disp, glMultiTexCoord3fvARB);

+    SET_MultiTexCoord3iARB(disp, glMultiTexCoord3iARB);

+    SET_MultiTexCoord3ivARB(disp, glMultiTexCoord3ivARB);

+    SET_MultiTexCoord3sARB(disp, glMultiTexCoord3sARB);

+    SET_MultiTexCoord3svARB(disp, glMultiTexCoord3svARB);

+    SET_MultiTexCoord4dARB(disp, glMultiTexCoord4dARB);

+    SET_MultiTexCoord4dvARB(disp, glMultiTexCoord4dvARB);

+    SET_MultiTexCoord4fARB(disp, glMultiTexCoord4fARB);

+    SET_MultiTexCoord4fvARB(disp, glMultiTexCoord4fvARB);

+    SET_MultiTexCoord4iARB(disp, glMultiTexCoord4iARB);

+    SET_MultiTexCoord4ivARB(disp, glMultiTexCoord4ivARB);

+    SET_MultiTexCoord4sARB(disp, glMultiTexCoord4sARB);

+    SET_MultiTexCoord4svARB(disp, glMultiTexCoord4svARB);

+#endif

+

+#if GL_ARB_occlusion_query

+    SET_BeginQueryARB(disp, glBeginQueryARB);

+    SET_DeleteQueriesARB(disp, glDeleteQueriesARB);

+    SET_EndQueryARB(disp, glEndQueryARB);

+    SET_GenQueriesARB(disp, glGenQueriesARB);

+    SET_GetQueryObjectivARB(disp, glGetQueryObjectivARB);

+    SET_GetQueryObjectuivARB(disp, glGetQueryObjectuivARB);

+    SET_GetQueryivARB(disp, glGetQueryivARB);

+    SET_IsQueryARB(disp, glIsQueryARB);

+#endif

+

+#if GL_ARB_shader_objects

+    SET_AttachObjectARB(disp, glAttachObjectARB);

+    SET_CompileShaderARB(disp, glCompileShaderARB);

+    SET_DeleteObjectARB(disp, glDeleteObjectARB);

+    SET_GetHandleARB(disp, glGetHandleARB);

+    SET_DetachObjectARB(disp, glDetachObjectARB);

+    SET_CreateProgramObjectARB(disp, glCreateProgramObjectARB);

+    SET_CreateShaderObjectARB(disp, glCreateShaderObjectARB);

+    SET_GetInfoLogARB(disp, glGetInfoLogARB);

+    SET_GetActiveUniformARB(disp, glGetActiveUniformARB);

+    SET_GetAttachedObjectsARB(disp, glGetAttachedObjectsARB);

+    SET_GetObjectParameterfvARB(disp, glGetObjectParameterfvARB);

+    SET_GetObjectParameterivARB(disp, glGetObjectParameterivARB);

+    SET_GetShaderSourceARB(disp, glGetShaderSourceARB);

+    SET_GetUniformLocationARB(disp, glGetUniformLocationARB);

+    SET_GetUniformfvARB(disp, glGetUniformfvARB);

+    SET_GetUniformivARB(disp, glGetUniformivARB);

+    SET_LinkProgramARB(disp, glLinkProgramARB);

+    SET_ShaderSourceARB(disp, glShaderSourceARB);

+    SET_Uniform1fARB(disp, glUniform1fARB);

+    SET_Uniform1fvARB(disp, glUniform1fvARB);

+    SET_Uniform1iARB(disp, glUniform1iARB);

+    SET_Uniform1ivARB(disp, glUniform1ivARB);

+    SET_Uniform2fARB(disp, glUniform2fARB);

+    SET_Uniform2fvARB(disp, glUniform2fvARB);

+    SET_Uniform2iARB(disp, glUniform2iARB);

+    SET_Uniform2ivARB(disp, glUniform2ivARB);

+    SET_Uniform3fARB(disp, glUniform3fARB);

+    SET_Uniform3fvARB(disp, glUniform3fvARB);

+    SET_Uniform3iARB(disp, glUniform3iARB);

+    SET_Uniform3ivARB(disp, glUniform3ivARB);

+    SET_Uniform4fARB(disp, glUniform4fARB);

+    SET_Uniform4fvARB(disp, glUniform4fvARB);

+    SET_Uniform4iARB(disp, glUniform4iARB);

+    SET_Uniform4ivARB(disp, glUniform4ivARB);

+    SET_UniformMatrix2fvARB(disp, glUniformMatrix2fvARB);

+    SET_UniformMatrix3fvARB(disp, glUniformMatrix3fvARB);

+    SET_UniformMatrix4fvARB(disp, glUniformMatrix4fvARB);

+    SET_UseProgramObjectARB(disp, glUseProgramObjectARB);

+    SET_ValidateProgramARB(disp, glValidateProgramARB);

+#endif

+

+#if GL_ARB_texture_compression

+    SET_CompressedTexImage1DARB(disp, glCompressedTexImage1DARB);

+    SET_CompressedTexImage2DARB(disp, glCompressedTexImage2DARB);

+    SET_CompressedTexImage3DARB(disp, glCompressedTexImage3DARB);

+    SET_CompressedTexSubImage1DARB(disp, glCompressedTexSubImage1DARB);

+    SET_CompressedTexSubImage2DARB(disp, glCompressedTexSubImage2DARB);

+    SET_CompressedTexSubImage3DARB(disp, glCompressedTexSubImage3DARB);

+    SET_GetCompressedTexImageARB(disp, glGetCompressedTexImageARB);

+#endif

+

+#if GL_ARB_transpose_matrix

+    SET_LoadTransposeMatrixdARB(disp, glLoadTransposeMatrixdARB);

+    SET_LoadTransposeMatrixfARB(disp, glLoadTransposeMatrixfARB);

+    SET_MultTransposeMatrixdARB(disp, glMultTransposeMatrixdARB);

+    SET_MultTransposeMatrixfARB(disp, glMultTransposeMatrixfARB);

+#endif

+

+#if GL_ARB_vertex_buffer_object

+    SET_BindBufferARB(disp, glBindBufferARB);

+    SET_BufferDataARB(disp, glBufferDataARB);

+    SET_BufferSubDataARB(disp, glBufferSubDataARB);

+    SET_DeleteBuffersARB(disp, glDeleteBuffersARB);

+    SET_GenBuffersARB(disp, glGenBuffersARB);

+    SET_GetBufferParameterivARB(disp, glGetBufferParameterivARB);

+    SET_GetBufferPointervARB(disp, glGetBufferPointervARB);

+    SET_GetBufferSubDataARB(disp, glGetBufferSubDataARB);

+    SET_IsBufferARB(disp, glIsBufferARB);

+    SET_MapBufferARB(disp, glMapBufferARB);

+    SET_UnmapBufferARB(disp, glUnmapBufferARB);

+#endif

+

+#if GL_ARB_vertex_program

+    SET_DisableVertexAttribArrayARB(disp, glDisableVertexAttribArrayARB);

+    SET_EnableVertexAttribArrayARB(disp, glEnableVertexAttribArrayARB);

+    SET_GetProgramEnvParameterdvARB(disp, glGetProgramEnvParameterdvARB);

+    SET_GetProgramEnvParameterfvARB(disp, glGetProgramEnvParameterfvARB);

+    SET_GetProgramLocalParameterdvARB(disp, glGetProgramLocalParameterdvARB);

+    SET_GetProgramLocalParameterfvARB(disp, glGetProgramLocalParameterfvARB);

+    SET_GetProgramStringARB(disp, glGetProgramStringARB);

+    SET_GetProgramivARB(disp, glGetProgramivARB);

+    SET_GetVertexAttribdvARB(disp, glGetVertexAttribdvARB);

+    SET_GetVertexAttribfvARB(disp, glGetVertexAttribfvARB);

+    SET_GetVertexAttribivARB(disp, glGetVertexAttribivARB);

+    SET_ProgramEnvParameter4dARB(disp, glProgramEnvParameter4dARB);

+    SET_ProgramEnvParameter4dvARB(disp, glProgramEnvParameter4dvARB);

+    SET_ProgramEnvParameter4fARB(disp, glProgramEnvParameter4fARB);

+    SET_ProgramEnvParameter4fvARB(disp, glProgramEnvParameter4fvARB);

+    SET_ProgramLocalParameter4dARB(disp, glProgramLocalParameter4dARB);

+    SET_ProgramLocalParameter4dvARB(disp, glProgramLocalParameter4dvARB);

+    SET_ProgramLocalParameter4fARB(disp, glProgramLocalParameter4fARB);

+    SET_ProgramLocalParameter4fvARB(disp, glProgramLocalParameter4fvARB);

+    SET_ProgramStringARB(disp, glProgramStringARB);

+    SET_VertexAttrib1dARB(disp, glVertexAttrib1dARB);

+    SET_VertexAttrib1dvARB(disp, glVertexAttrib1dvARB);

+    SET_VertexAttrib1fARB(disp, glVertexAttrib1fARB);

+    SET_VertexAttrib1fvARB(disp, glVertexAttrib1fvARB);

+    SET_VertexAttrib1sARB(disp, glVertexAttrib1sARB);

+    SET_VertexAttrib1svARB(disp, glVertexAttrib1svARB);

+    SET_VertexAttrib2dARB(disp, glVertexAttrib2dARB);

+    SET_VertexAttrib2dvARB(disp, glVertexAttrib2dvARB);

+    SET_VertexAttrib2fARB(disp, glVertexAttrib2fARB);

+    SET_VertexAttrib2fvARB(disp, glVertexAttrib2fvARB);

+    SET_VertexAttrib2sARB(disp, glVertexAttrib2sARB);

+    SET_VertexAttrib2svARB(disp, glVertexAttrib2svARB);

+    SET_VertexAttrib3dARB(disp, glVertexAttrib3dARB);

+    SET_VertexAttrib3dvARB(disp, glVertexAttrib3dvARB);

+    SET_VertexAttrib3fARB(disp, glVertexAttrib3fARB);

+    SET_VertexAttrib3fvARB(disp, glVertexAttrib3fvARB);

+    SET_VertexAttrib3sARB(disp, glVertexAttrib3sARB);

+    SET_VertexAttrib3svARB(disp, glVertexAttrib3svARB);

+    SET_VertexAttrib4NbvARB(disp, glVertexAttrib4NbvARB);

+    SET_VertexAttrib4NivARB(disp, glVertexAttrib4NivARB);

+    SET_VertexAttrib4NsvARB(disp, glVertexAttrib4NsvARB);

+    SET_VertexAttrib4NubARB(disp, glVertexAttrib4NubARB);

+    SET_VertexAttrib4NubvARB(disp, glVertexAttrib4NubvARB);

+    SET_VertexAttrib4NuivARB(disp, glVertexAttrib4NuivARB);

+    SET_VertexAttrib4NusvARB(disp, glVertexAttrib4NusvARB);

+    SET_VertexAttrib4bvARB(disp, glVertexAttrib4bvARB);

+    SET_VertexAttrib4dARB(disp, glVertexAttrib4dARB);

+    SET_VertexAttrib4dvARB(disp, glVertexAttrib4dvARB);

+    SET_VertexAttrib4fARB(disp, glVertexAttrib4fARB);

+    SET_VertexAttrib4fvARB(disp, glVertexAttrib4fvARB);

+    SET_VertexAttrib4ivARB(disp, glVertexAttrib4ivARB);

+    SET_VertexAttrib4sARB(disp, glVertexAttrib4sARB);

+    SET_VertexAttrib4svARB(disp, glVertexAttrib4svARB);

+    SET_VertexAttrib4ubvARB(disp, glVertexAttrib4ubvARB);

+    SET_VertexAttrib4uivARB(disp, glVertexAttrib4uivARB);

+    SET_VertexAttrib4usvARB(disp, glVertexAttrib4usvARB);

+    SET_VertexAttribPointerARB(disp, glVertexAttribPointerARB);

+#endif

+

+#if GL_ARB_vertex_shader

+    SET_BindAttribLocationARB(disp, glBindAttribLocationARB);

+    SET_GetActiveAttribARB(disp, glGetActiveAttribARB);

+    SET_GetAttribLocationARB(disp, glGetAttribLocationARB);

+#endif

+

+#if GL_ARB_window_pos

+    SET_WindowPos2dMESA(disp, glWindowPos2dARB);

+    SET_WindowPos2dvMESA(disp, glWindowPos2dvARB);

+    SET_WindowPos2fMESA(disp, glWindowPos2fARB);

+    SET_WindowPos2fvMESA(disp, glWindowPos2fvARB);

+    SET_WindowPos2iMESA(disp, glWindowPos2iARB);

+    SET_WindowPos2ivMESA(disp, glWindowPos2ivARB);

+    SET_WindowPos2sMESA(disp, glWindowPos2sARB);

+    SET_WindowPos2svMESA(disp, glWindowPos2svARB);

+    SET_WindowPos3dMESA(disp, glWindowPos3dARB);

+    SET_WindowPos3dvMESA(disp, glWindowPos3dvARB);

+    SET_WindowPos3fMESA(disp, glWindowPos3fARB);

+    SET_WindowPos3fvMESA(disp, glWindowPos3fvARB);

+    SET_WindowPos3iMESA(disp, glWindowPos3iARB);

+    SET_WindowPos3ivMESA(disp, glWindowPos3ivARB);

+    SET_WindowPos3sMESA(disp, glWindowPos3sARB);

+    SET_WindowPos3svMESA(disp, glWindowPos3svARB);

+#endif

+

+#if GL_ATI_fragment_shader

+    SET_AlphaFragmentOp1ATI(disp, glAlphaFragmentOp1ATI);

+    SET_AlphaFragmentOp2ATI(disp, glAlphaFragmentOp2ATI);

+    SET_AlphaFragmentOp3ATI(disp, glAlphaFragmentOp3ATI);

+    SET_BeginFragmentShaderATI(disp, glBeginFragmentShaderATI);

+    SET_BindFragmentShaderATI(disp, glBindFragmentShaderATI);

+    SET_ColorFragmentOp1ATI(disp, glColorFragmentOp1ATI);

+    SET_ColorFragmentOp2ATI(disp, glColorFragmentOp2ATI);

+    SET_ColorFragmentOp3ATI(disp, glColorFragmentOp3ATI);

+    SET_DeleteFragmentShaderATI(disp, glDeleteFragmentShaderATI);

+    SET_EndFragmentShaderATI(disp, glEndFragmentShaderATI);

+    SET_GenFragmentShadersATI(disp, glGenFragmentShadersATI);

+    SET_PassTexCoordATI(disp, glPassTexCoordATI);

+    SET_SampleMapATI(disp, glSampleMapATI);

+    SET_SetFragmentShaderConstantATI(disp, glSetFragmentShaderConstantATI);

+#elif GL_EXT_fragment_shader

+    SET_AlphaFragmentOp1ATI(disp, glAlphaFragmentOp1EXT);

+    SET_AlphaFragmentOp2ATI(disp, glAlphaFragmentOp2EXT);

+    SET_AlphaFragmentOp3ATI(disp, glAlphaFragmentOp3EXT);

+    SET_BeginFragmentShaderATI(disp, glBeginFragmentShaderEXT);

+    SET_BindFragmentShaderATI(disp, glBindFragmentShaderEXT);

+    SET_ColorFragmentOp1ATI(disp, glColorFragmentOp1EXT);

+    SET_ColorFragmentOp2ATI(disp, glColorFragmentOp2EXT);

+    SET_ColorFragmentOp3ATI(disp, glColorFragmentOp3EXT);

+    SET_DeleteFragmentShaderATI(disp, glDeleteFragmentShaderEXT);

+    SET_EndFragmentShaderATI(disp, glEndFragmentShaderEXT);

+    SET_GenFragmentShadersATI(disp, glGenFragmentShadersEXT);

+    SET_PassTexCoordATI(disp, glPassTexCoordEXT);

+    SET_SampleMapATI(disp, glSampleMapEXT);

+    SET_SetFragmentShaderConstantATI(disp, glSetFragmentShaderConstantEXT);

+#endif

+

+#if GL_ATI_separate_stencil

+    SET_StencilFuncSeparateATI(disp, glStencilFuncSeparateATI);

+#endif

+

+#if GL_EXT_blend_equation_separate

+    SET_BlendEquationSeparateEXT(disp, glBlendEquationSeparateEXT);

+#endif

+

+#if GL_EXT_blend_func_separate

+    SET_BlendFuncSeparateEXT(disp, glBlendFuncSeparateEXT);

+#endif

+

+#if GL_EXT_depth_bounds_test

+    SET_DepthBoundsEXT(disp, glDepthBoundsEXT);

+#endif

+

+#if GL_EXT_compiled_vertex_array

+    SET_LockArraysEXT(disp, glLockArraysEXT);

+    SET_UnlockArraysEXT(disp, glUnlockArraysEXT);

+#endif

+

+#if GL_EXT_cull_vertex

+    SET_CullParameterdvEXT(disp, glCullParameterdvEXT);

+    SET_CullParameterfvEXT(disp, glCullParameterfvEXT);

+#endif

+

+#if GL_EXT_fog_coord

+    SET_FogCoordPointerEXT(disp, glFogCoordPointerEXT);

+    SET_FogCoorddEXT(disp, glFogCoorddEXT);

+    SET_FogCoorddvEXT(disp, glFogCoorddvEXT);

+    SET_FogCoordfEXT(disp, glFogCoordfEXT);

+    SET_FogCoordfvEXT(disp, glFogCoordfvEXT);

+#endif

+

+#if GL_EXT_framebuffer_blit

+    SET_BlitFramebufferEXT(disp, glBlitFramebufferEXT);

+#endif

+

+#if GL_EXT_framebuffer_object

+    SET_BindFramebufferEXT(disp, glBindFramebufferEXT);

+    SET_BindRenderbufferEXT(disp, glBindRenderbufferEXT);

+    SET_CheckFramebufferStatusEXT(disp, glCheckFramebufferStatusEXT);

+    SET_DeleteFramebuffersEXT(disp, glDeleteFramebuffersEXT);

+    SET_DeleteRenderbuffersEXT(disp, glDeleteRenderbuffersEXT);

+    SET_FramebufferRenderbufferEXT(disp, glFramebufferRenderbufferEXT);

+    SET_FramebufferTexture1DEXT(disp, glFramebufferTexture1DEXT);

+    SET_FramebufferTexture2DEXT(disp, glFramebufferTexture2DEXT);

+    SET_FramebufferTexture3DEXT(disp, glFramebufferTexture3DEXT);

+    SET_GenerateMipmapEXT(disp, glGenerateMipmapEXT);

+    SET_GenFramebuffersEXT(disp, glGenFramebuffersEXT);

+    SET_GenRenderbuffersEXT(disp, glGenRenderbuffersEXT);

+    SET_GetFramebufferAttachmentParameterivEXT(disp, glGetFramebufferAttachmentParameterivEXT);

+    SET_GetRenderbufferParameterivEXT(disp, glGetRenderbufferParameterivEXT);

+    SET_IsFramebufferEXT(disp, glIsFramebufferEXT);

+    SET_IsRenderbufferEXT(disp, glIsRenderbufferEXT);

+    SET_RenderbufferStorageEXT(disp, glRenderbufferStorageEXT);

+#endif

+

+#if GL_EXT_gpu_program_parameters

+    SET_ProgramEnvParameters4fvEXT(disp, glProgramEnvParameters4fvEXT);

+    SET_ProgramLocalParameters4fvEXT(disp, glProgramLocalParameters4fvEXT);

+#endif

+

+#if GL_EXT_multi_draw_arrays

+    /* Pointer Incompatability:

+     * This warning can be safely ignored.  OpenGL.framework adds const to the

+     * two pointers.

+     *

+     * extern void glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei);

+     *

+     * void ( * MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount);

+     */

+    SET_MultiDrawArraysEXT(disp, (void *)glMultiDrawArraysEXT);

+    SET_MultiDrawElementsEXT(disp, glMultiDrawElementsEXT);

+#endif

+

+#if GL_EXT_point_parameters

+    SET_PointParameterfEXT(disp, glPointParameterfEXT);

+    SET_PointParameterfvEXT(disp, glPointParameterfvEXT);

+#elif GL_ARB_point_parameters

+    SET_PointParameterfEXT(disp, glPointParameterfARB);

+    SET_PointParameterfvEXT(disp, glPointParameterfvARB);

+#endif

+

+#if GL_EXT_polygon_offset

+    SET_PolygonOffsetEXT(disp, glPolygonOffsetEXT);

+#endif

+

+#if GL_EXT_secondary_color

+    SET_SecondaryColor3bEXT(disp, glSecondaryColor3bEXT);

+    SET_SecondaryColor3bvEXT(disp, glSecondaryColor3bvEXT);

+    SET_SecondaryColor3dEXT(disp, glSecondaryColor3dEXT);

+    SET_SecondaryColor3dvEXT(disp, glSecondaryColor3dvEXT);

+    SET_SecondaryColor3fEXT(disp, glSecondaryColor3fEXT);

+    SET_SecondaryColor3fvEXT(disp, glSecondaryColor3fvEXT);

+    SET_SecondaryColor3iEXT(disp, glSecondaryColor3iEXT);

+    SET_SecondaryColor3ivEXT(disp, glSecondaryColor3ivEXT);

+    SET_SecondaryColor3sEXT(disp, glSecondaryColor3sEXT);

+    SET_SecondaryColor3svEXT(disp, glSecondaryColor3svEXT);

+    SET_SecondaryColor3ubEXT(disp, glSecondaryColor3ubEXT);

+    SET_SecondaryColor3ubvEXT(disp, glSecondaryColor3ubvEXT);

+    SET_SecondaryColor3uiEXT(disp, glSecondaryColor3uiEXT);

+    SET_SecondaryColor3uivEXT(disp, glSecondaryColor3uivEXT);

+    SET_SecondaryColor3usEXT(disp, glSecondaryColor3usEXT);

+    SET_SecondaryColor3usvEXT(disp, glSecondaryColor3usvEXT);

+    SET_SecondaryColorPointerEXT(disp, glSecondaryColorPointerEXT);

+#endif

+

+#if GL_EXT_stencil_two_side

+    SET_ActiveStencilFaceEXT(disp, glActiveStencilFaceEXT);

+#endif

+

+#if GL_EXT_timer_query

+    SET_GetQueryObjecti64vEXT(disp, glGetQueryObjecti64vEXT);

+    SET_GetQueryObjectui64vEXT(disp, glGetQueryObjectui64vEXT);

+#endif

+

+#if GL_EXT_vertex_array

+    SET_ColorPointerEXT(disp, glColorPointerEXT);

+    SET_EdgeFlagPointerEXT(disp, glEdgeFlagPointerEXT);

+    SET_IndexPointerEXT(disp, glIndexPointerEXT);

+    SET_NormalPointerEXT(disp, glNormalPointerEXT);

+    SET_TexCoordPointerEXT(disp, glTexCoordPointerEXT);

+    SET_VertexPointerEXT(disp, glVertexPointerEXT);

+#endif

+

+#if GL_IBM_multimode_draw_arrays

+    SET_MultiModeDrawArraysIBM(disp, glMultiModeDrawArraysIBM);

+    SET_MultiModeDrawElementsIBM(disp, glMultiModeDrawElementsIBM);

+#endif

+

+#if GL_MESA_resize_buffers

+    SET_ResizeBuffersMESA(disp, glResizeBuffersMESA);

+#endif

+

+#if GL_MESA_window_pos

+    SET_WindowPos4dMESA(disp, glWindowPos4dMESA);

+    SET_WindowPos4dvMESA(disp, glWindowPos4dvMESA);

+    SET_WindowPos4fMESA(disp, glWindowPos4fMESA);

+    SET_WindowPos4fvMESA(disp, glWindowPos4fvMESA);

+    SET_WindowPos4iMESA(disp, glWindowPos4iMESA);

+    SET_WindowPos4ivMESA(disp, glWindowPos4ivMESA);

+    SET_WindowPos4sMESA(disp, glWindowPos4sMESA);

+    SET_WindowPos4svMESA(disp, glWindowPos4svMESA);

+#endif

+

+#if GL_NV_fence

+    SET_DeleteFencesNV(disp, glDeleteFencesNV);

+    SET_FinishFenceNV(disp, glFinishFenceNV);

+    SET_GenFencesNV(disp, glGenFencesNV);

+    SET_GetFenceivNV(disp, glGetFenceivNV);

+    SET_IsFenceNV(disp, glIsFenceNV);

+    SET_SetFenceNV(disp, glSetFenceNV);

+    SET_TestFenceNV(disp, glTestFenceNV);

+#endif

+

+#if GL_NV_fragment_program

+    SET_GetProgramNamedParameterdvNV(disp, glGetProgramNamedParameterdvNV);

+    SET_GetProgramNamedParameterfvNV(disp, glGetProgramNamedParameterfvNV);

+    SET_ProgramNamedParameter4dNV(disp, glProgramNamedParameter4dNV);

+    SET_ProgramNamedParameter4dvNV(disp, glProgramNamedParameter4dvNV);

+    SET_ProgramNamedParameter4fNV(disp, glProgramNamedParameter4fNV);

+    SET_ProgramNamedParameter4fvNV(disp, glProgramNamedParameter4fvNV);

+#endif

+

+#if GL_NV_geometry_program4

+    SET_FramebufferTextureLayerEXT(disp, glFramebufferTextureLayerEXT);

+#endif

+

+#if GL_NV_point_sprite

+    SET_PointParameteriNV(disp, glPointParameteriNV);

+    SET_PointParameterivNV(disp, glPointParameterivNV);

+#endif

+

+#if GL_NV_register_combiners

+    SET_CombinerInputNV(disp, glCombinerInputNV);

+    SET_CombinerOutputNV(disp, glCombinerOutputNV);

+    SET_CombinerParameterfNV(disp, glCombinerParameterfNV);

+    SET_CombinerParameterfvNV(disp, glCombinerParameterfvNV);

+    SET_CombinerParameteriNV(disp, glCombinerParameteriNV);

+    SET_CombinerParameterivNV(disp, glCombinerParameterivNV);

+    SET_FinalCombinerInputNV(disp, glFinalCombinerInputNV);

+    SET_GetCombinerInputParameterfvNV(disp, glGetCombinerInputParameterfvNV);

+    SET_GetCombinerInputParameterivNV(disp, glGetCombinerInputParameterivNV);

+    SET_GetCombinerOutputParameterfvNV(disp, glGetCombinerOutputParameterfvNV);

+    SET_GetCombinerOutputParameterivNV(disp, glGetCombinerOutputParameterivNV);

+    SET_GetFinalCombinerInputParameterfvNV(disp, glGetFinalCombinerInputParameterfvNV);

+    SET_GetFinalCombinerInputParameterivNV(disp, glGetFinalCombinerInputParameterivNV);

+#endif

+

+#if GL_NV_vertex_array_range

+    SET_FlushVertexArrayRangeNV(disp, glFlushVertexArrayRangeNV);

+    SET_VertexArrayRangeNV(disp, glVertexArrayRangeNV);

+#endif

+

+#if GL_NV_vertex_program

+    SET_AreProgramsResidentNV(disp, glAreProgramsResidentNV);

+    SET_BindProgramNV(disp, glBindProgramNV);

+    SET_DeleteProgramsNV(disp, glDeleteProgramsNV);

+    SET_ExecuteProgramNV(disp, glExecuteProgramNV);

+    SET_GenProgramsNV(disp, glGenProgramsNV);

+    SET_GetProgramParameterdvNV(disp, glGetProgramParameterdvNV);

+    SET_GetProgramParameterfvNV(disp, glGetProgramParameterfvNV);

+    SET_GetProgramStringNV(disp, glGetProgramStringNV);

+    SET_GetProgramivNV(disp, glGetProgramivNV);

+    SET_GetTrackMatrixivNV(disp, glGetTrackMatrixivNV);

+    SET_GetVertexAttribPointervNV(disp, glGetVertexAttribPointervNV);

+    SET_GetVertexAttribdvNV(disp, glGetVertexAttribdvNV);

+    SET_GetVertexAttribfvNV(disp, glGetVertexAttribfvNV);

+    SET_GetVertexAttribivNV(disp, glGetVertexAttribivNV);

+    SET_IsProgramNV(disp, glIsProgramNV);

+    SET_LoadProgramNV(disp, glLoadProgramNV);

+    SET_ProgramParameters4dvNV(disp, glProgramParameters4dvNV);

+    SET_ProgramParameters4fvNV(disp, glProgramParameters4fvNV);

+    SET_RequestResidentProgramsNV(disp, glRequestResidentProgramsNV);

+    SET_TrackMatrixNV(disp, glTrackMatrixNV);

+    SET_VertexAttrib1dNV(disp, glVertexAttrib1dNV)

+    SET_VertexAttrib1dvNV(disp, glVertexAttrib1dvNV)

+    SET_VertexAttrib1fNV(disp, glVertexAttrib1fNV)

+    SET_VertexAttrib1fvNV(disp, glVertexAttrib1fvNV)

+    SET_VertexAttrib1sNV(disp, glVertexAttrib1sNV)

+    SET_VertexAttrib1svNV(disp, glVertexAttrib1svNV)

+    SET_VertexAttrib2dNV(disp, glVertexAttrib2dNV)

+    SET_VertexAttrib2dvNV(disp, glVertexAttrib2dvNV)

+    SET_VertexAttrib2fNV(disp, glVertexAttrib2fNV)

+    SET_VertexAttrib2fvNV(disp, glVertexAttrib2fvNV)

+    SET_VertexAttrib2sNV(disp, glVertexAttrib2sNV)

+    SET_VertexAttrib2svNV(disp, glVertexAttrib2svNV)

+    SET_VertexAttrib3dNV(disp, glVertexAttrib3dNV)

+    SET_VertexAttrib3dvNV(disp, glVertexAttrib3dvNV)

+    SET_VertexAttrib3fNV(disp, glVertexAttrib3fNV)

+    SET_VertexAttrib3fvNV(disp, glVertexAttrib3fvNV)

+    SET_VertexAttrib3sNV(disp, glVertexAttrib3sNV)

+    SET_VertexAttrib3svNV(disp, glVertexAttrib3svNV)

+    SET_VertexAttrib4dNV(disp, glVertexAttrib4dNV)

+    SET_VertexAttrib4dvNV(disp, glVertexAttrib4dvNV)

+    SET_VertexAttrib4fNV(disp, glVertexAttrib4fNV)

+    SET_VertexAttrib4fvNV(disp, glVertexAttrib4fvNV)

+    SET_VertexAttrib4sNV(disp, glVertexAttrib4sNV)

+    SET_VertexAttrib4svNV(disp, glVertexAttrib4svNV)

+    SET_VertexAttrib4ubNV(disp, glVertexAttrib4ubNV)

+    SET_VertexAttrib4ubvNV(disp, glVertexAttrib4ubvNV)

+    SET_VertexAttribPointerNV(disp, glVertexAttribPointerNV)

+    SET_VertexAttribs1dvNV(disp, glVertexAttribs1dvNV)

+    SET_VertexAttribs1fvNV(disp, glVertexAttribs1fvNV)

+    SET_VertexAttribs1svNV(disp, glVertexAttribs1svNV)

+    SET_VertexAttribs2dvNV(disp, glVertexAttribs2dvNV)

+    SET_VertexAttribs2fvNV(disp, glVertexAttribs2fvNV)

+    SET_VertexAttribs2svNV(disp, glVertexAttribs2svNV)

+    SET_VertexAttribs3dvNV(disp, glVertexAttribs3dvNV)

+    SET_VertexAttribs3fvNV(disp, glVertexAttribs3fvNV)

+    SET_VertexAttribs3svNV(disp, glVertexAttribs3svNV)

+    SET_VertexAttribs4dvNV(disp, glVertexAttribs4dvNV)

+    SET_VertexAttribs4fvNV(disp, glVertexAttribs4fvNV)

+    SET_VertexAttribs4svNV(disp, glVertexAttribs4svNV)

+    SET_VertexAttribs4ubvNV(disp, glVertexAttribs4ubvNV)

+#endif

+

+#if GL_SGIS_multisample

+    SET_SampleMaskSGIS(disp, glSampleMaskSGIS);

+    SET_SamplePatternSGIS(disp, glSamplePatternSGIS);

+#endif

+

+#if GL_SGIS_pixel_texture

+    SET_GetPixelTexGenParameterfvSGIS(disp, glGetPixelTexGenParameterfvSGIS);

+    SET_GetPixelTexGenParameterivSGIS(disp, glGetPixelTexGenParameterivSGIS);

+    SET_PixelTexGenParameterfSGIS(disp, glPixelTexGenParameterfSGIS);

+    SET_PixelTexGenParameterfvSGIS(disp, glPixelTexGenParameterfvSGIS);

+    SET_PixelTexGenParameteriSGIS(disp, glPixelTexGenParameteriSGIS);

+    SET_PixelTexGenParameterivSGIS(disp, glPixelTexGenParameterivSGIS);

+    SET_PixelTexGenSGIX(disp, glPixelTexGenSGIX);

+#endif

+}

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 098973ca3..48094a69e 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -415,10 +415,12 @@ static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
 static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
                                         __GLXconfig *modes,
                                         __GLXcontext *baseShareContext);
-static __GLXdrawable *glxWinCreateDrawable(__GLXscreen *screen,
+static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
+                                          __GLXscreen *screen,
                                           DrawablePtr pDraw,
-                                          int type,
                                           XID drawId,
+                                          int type,
+                                          XID glxDrawId,
                                           __GLXconfig *conf);
 
 static Bool glxWinRealizeWindow(WindowPtr pWin);
@@ -1026,11 +1028,13 @@ glxWinDrawableDestroy(__GLXdrawable *base)
 }
 
 static __GLXdrawable *
-glxWinCreateDrawable(__GLXscreen *screen,
-                    DrawablePtr pDraw,
-                    int type,
-                    XID drawId,
-                    __GLXconfig *conf)
+glxWinCreateDrawable(ClientPtr client,
+			     __GLXscreen *screen,
+			     DrawablePtr pDraw,
+			     XID drawId,
+			     int type,
+			     XID glxDrawId,
+			     __GLXconfig *conf)
 {
   __GLXWinDrawable *glxPriv;
 
@@ -1039,7 +1043,7 @@ glxWinCreateDrawable(__GLXscreen *screen,
   if (glxPriv == NULL)
       return NULL;
 
-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
+  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
     xfree(glxPriv);
     return NULL;
   }