Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 298 insertions, 295 deletions

diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index a51d6621a..6e310f1cd 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -1,295 +1,298 @@
-/*

- * Copyright © 2008 Red Hat, Inc

- *

- * 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_DIX_CONFIG_H

-#include <dix-config.h>

-#else

-

-#include "glheader.h"

-

-#endif

-

-#include <stdint.h>

-#include <errno.h>

-#include <dlfcn.h>

-#include <sys/time.h>

-#include <GL/gl.h>

-#include <GL/glxtokens.h>

-#include <GL/internal/dri_interface.h>

-#include <os.h>

-#include "glxserver.h"

-#include "glxcontext.h"

-#include "glxscreens.h"

-#include "glxdricommon.h"

-

-#ifdef _MSC_VER

-#define dlerror() "Getting loadlibrary error string not implemented"

-#endif

-

-static int

-getUST(int64_t *ust)

-{

-    struct timeval  tv;

-    

-    if (ust == NULL)

-	return -EFAULT;

-

-#ifdef _MSC_VER

-    __asm int 3;

-#else

-    if (gettimeofday(&tv, NULL) == 0) {

-	ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;

-	return 0;

-    } else {

-	return -errno;

-    }

-    #endif

-}

-

-const __DRIsystemTimeExtension systemTimeExtension = {

-    { __DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION },

-    getUST,

-    NULL,

-};

-    

-#define __ATTRIB(attrib, field) \

-    { attrib, offsetof(__GLXconfig, field) }

-

-static const struct { unsigned int attrib, offset; } attribMap[] = {

-    __ATTRIB(__DRI_ATTRIB_BUFFER_SIZE,			rgbBits),

-    __ATTRIB(__DRI_ATTRIB_LEVEL,			level),

-    __ATTRIB(__DRI_ATTRIB_RED_SIZE,			redBits),

-    __ATTRIB(__DRI_ATTRIB_GREEN_SIZE,			greenBits),

-    __ATTRIB(__DRI_ATTRIB_BLUE_SIZE,			blueBits),

-    __ATTRIB(__DRI_ATTRIB_ALPHA_SIZE,			alphaBits),

-    __ATTRIB(__DRI_ATTRIB_DEPTH_SIZE,			depthBits),

-    __ATTRIB(__DRI_ATTRIB_STENCIL_SIZE,			stencilBits),

-    __ATTRIB(__DRI_ATTRIB_ACCUM_RED_SIZE,		accumRedBits),

-    __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE,		accumGreenBits),

-    __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE,		accumBlueBits),

-    __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE,		accumAlphaBits),

-    __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS,		sampleBuffers),

-    __ATTRIB(__DRI_ATTRIB_SAMPLES,			samples),

-    __ATTRIB(__DRI_ATTRIB_DOUBLE_BUFFER,		doubleBufferMode),

-    __ATTRIB(__DRI_ATTRIB_STEREO,			stereoMode),

-    __ATTRIB(__DRI_ATTRIB_AUX_BUFFERS,			numAuxBuffers),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_TYPE,		transparentPixel),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_INDEX_VALUE,	transparentPixel),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_RED_VALUE,	transparentRed),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE,	transparentGreen),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,	transparentBlue),

-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE,	transparentAlpha),

-    __ATTRIB(__DRI_ATTRIB_RED_MASK,			redMask),

-    __ATTRIB(__DRI_ATTRIB_GREEN_MASK,			greenMask),

-    __ATTRIB(__DRI_ATTRIB_BLUE_MASK,			blueMask),

-    __ATTRIB(__DRI_ATTRIB_ALPHA_MASK,			alphaMask),

-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH,		maxPbufferWidth),

-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT,		maxPbufferHeight),

-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS,		maxPbufferPixels),

-    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH,	optimalPbufferWidth),

-    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT,	optimalPbufferHeight),

-    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			swapMethod),

-    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB,		bindToTextureRgb),

-    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA,		bindToTextureRgba),

-    __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,	bindToMipmapTexture),

-    __ATTRIB(__DRI_ATTRIB_YINVERTED,			yInverted),

-};

-

-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))

-

-static void

-setScalar(__GLXconfig *config, unsigned int attrib, unsigned int value)

-{

-    int i;

-

-    for (i = 0; i < ARRAY_SIZE(attribMap); i++)

-	if (attribMap[i].attrib == attrib) {

-	    *(unsigned int *) ((char *) config + attribMap[i].offset) = value;

-	    return;

-	}

-}

-

-static __GLXconfig *

-createModeFromConfig(const __DRIcoreExtension *core,

-		     const __DRIconfig *driConfig,

-		     unsigned int visualType, unsigned int drawableType)

-{

-    __GLXDRIconfig *config;

-    unsigned int attrib, value;

-    int i;

-

-    config = malloc(sizeof *config);

-

-    config->driConfig = driConfig;

-

-    i = 0;

-    while (core->indexConfigAttrib(driConfig, i++, &attrib, &value)) {

-	switch (attrib) {

-	case __DRI_ATTRIB_RENDER_TYPE:

-	    config->config.renderType = 0;

-	    if (value & __DRI_ATTRIB_RGBA_BIT)

-		config->config.renderType |= GLX_RGBA_BIT;

-	    if (value & __DRI_ATTRIB_COLOR_INDEX_BIT)

-		config->config.renderType |= GLX_COLOR_INDEX_BIT;

-	    break;

-	case __DRI_ATTRIB_CONFIG_CAVEAT:

-	    if (value & __DRI_ATTRIB_NON_CONFORMANT_CONFIG)

-		config->config.visualRating = GLX_NON_CONFORMANT_CONFIG;

-	    else if (value & __DRI_ATTRIB_SLOW_BIT)

-		config->config.visualRating = GLX_SLOW_CONFIG;

-	    else

-		config->config.visualRating = GLX_NONE;

-	    break;

-	case __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS:

-	    config->config.bindToTextureTargets = 0;

-	    if (value & __DRI_ATTRIB_TEXTURE_1D_BIT)

-		config->config.bindToTextureTargets |= GLX_TEXTURE_1D_BIT_EXT;

-	    if (value & __DRI_ATTRIB_TEXTURE_2D_BIT)

-		config->config.bindToTextureTargets |= GLX_TEXTURE_2D_BIT_EXT;

-	    if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)

-		config->config.bindToTextureTargets |= GLX_TEXTURE_RECTANGLE_BIT_EXT;

-	    break;	

-	default:

-	    setScalar(&config->config, attrib, value);

-	    break;

-	}

-    }

-

-    config->config.next = NULL;

-    config->config.xRenderable = GL_TRUE;

-    config->config.visualType = visualType;

-    config->config.drawableType = drawableType;

-

-    return &config->config;

-}

-

-__GLXconfig *

-glxConvertConfigs(const __DRIcoreExtension *core,

-		  const __DRIconfig **configs, unsigned int drawableType)

-{

-    __GLXconfig head, *tail;

-    int i;

-

-    tail = &head;

-    head.next = NULL;

-

-    for (i = 0; configs[i]; i++) {

-	tail->next = createModeFromConfig(core,

-					  configs[i], GLX_TRUE_COLOR,

-					  drawableType);

-	if (tail->next == NULL)

-	    break;

-

-	tail = tail->next;

-    }

-

-    for (i = 0; configs[i]; i++) {

-	tail->next = createModeFromConfig(core,

-					  configs[i], GLX_DIRECT_COLOR,

-					  drawableType);

-	if (tail->next == NULL)

-	    break;

-

-	tail = tail->next;

-    }

-

-    return head.next;

-}

-

-static const char dri_driver_path[] = DRI_DRIVER_PATH;

-

-void *

-glxProbeDriver(const char *driverName,

-	       void **coreExt, const char *coreName, int coreVersion,

-	       void **renderExt, const char *renderName, int renderVersion)

-{

-    int i;

-    void *driver;

-    char filename[PATH_MAX];

-    const __DRIextension **extensions;

-

-#ifdef _MSC_VER

-#ifdef _DEBUG

-#define DLLNAME "%s%s_dri_dbg.dll"

-#else

-#define DLLNAME "%s%s_dri.dll"

-#endif

-    snprintf(filename, sizeof filename, DLLNAME,

-             dri_driver_path, driverName);

-

-    driver = LoadLibrary(filename);

-#else

-    snprintf(filename, sizeof filename, "%s/%s_dri.so",

-             dri_driver_path, driverName);

-

-    driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);

-#endif

-    if (driver == NULL) {

-	LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",

-		   filename, dlerror());

-	goto cleanup_failure;

-    }

-

-#ifdef _MSC_VER

-    extensions = (const __DRIextension **)GetProcAddress(driver, __DRI_DRIVER_EXTENSIONS);

-#else

-    extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);

-#endif

-    if (extensions == NULL) {

-	LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",

-		   driverName, dlerror());

-	goto cleanup_failure;

-    }

-

-    for (i = 0; extensions[i]; i++) {

-	if (strcmp(extensions[i]->name, coreName) == 0 &&

-	    extensions[i]->version >= coreVersion) {

-		*coreExt = (void *)extensions[i];

-	}

-

-	if (strcmp(extensions[i]->name, renderName) == 0 &&

-	    extensions[i]->version >= renderVersion) {

-		*renderExt = (void *)extensions[i];

-	}

-    }

-

-    if (*coreExt == NULL || *renderExt == NULL) {

-	LogMessage(X_ERROR,

-		   "AIGLX error: %s does not export required DRI extension\n",

-		   driverName);

-	goto cleanup_failure;

-    }

-    return driver;

-

-cleanup_failure:

-    if (driver)

-#ifdef _MSC_VER

-    FreeLibrary(driver);

-#else

-        dlclose(driver);

-#endif

-    *coreExt = *renderExt = NULL;

-    return NULL;

-}

+/*
+ * Copyright © 2008 Red Hat, Inc
+ *
+ * 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_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
+
+#include <stdint.h>
+#include <errno.h>
+#include <dlfcn.h>
+#include <sys/time.h>
+#include <GL/gl.h>
+#include <GL/glxtokens.h>
+#include <GL/internal/dri_interface.h>
+#include <os.h>
+#include "glxserver.h"
+#include "glxcontext.h"
+#include "glxscreens.h"
+#include "glxdricommon.h"
+
+#ifdef _MSC_VER
+#define dlerror() "Getting loadlibrary error string not implemented"
+#endif
+
+static int
+getUST(int64_t * ust)
+{
+    struct timeval tv;
+
+    if (ust == NULL)
+        return -EFAULT;
+
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+    if (gettimeofday(&tv, NULL) == 0) {
+        ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
+        return 0;
+    }
+    else {
+        return -errno;
+    }
+    #endif
+}
+
+const __DRIsystemTimeExtension systemTimeExtension = {
+    {__DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION},
+    getUST,
+    NULL,
+};
+
+#define __ATTRIB(attrib, field) \
+    { attrib, offsetof(__GLXconfig, field) }
+
+static const struct {
+    unsigned int attrib, offset;
+} attribMap[] = {
+__ATTRIB(__DRI_ATTRIB_BUFFER_SIZE, rgbBits),
+        __ATTRIB(__DRI_ATTRIB_LEVEL, level),
+        __ATTRIB(__DRI_ATTRIB_RED_SIZE, redBits),
+        __ATTRIB(__DRI_ATTRIB_GREEN_SIZE, greenBits),
+        __ATTRIB(__DRI_ATTRIB_BLUE_SIZE, blueBits),
+        __ATTRIB(__DRI_ATTRIB_ALPHA_SIZE, alphaBits),
+        __ATTRIB(__DRI_ATTRIB_DEPTH_SIZE, depthBits),
+        __ATTRIB(__DRI_ATTRIB_STENCIL_SIZE, stencilBits),
+        __ATTRIB(__DRI_ATTRIB_ACCUM_RED_SIZE, accumRedBits),
+        __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE, accumGreenBits),
+        __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE, accumBlueBits),
+        __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE, accumAlphaBits),
+        __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS, sampleBuffers),
+        __ATTRIB(__DRI_ATTRIB_SAMPLES, samples),
+        __ATTRIB(__DRI_ATTRIB_DOUBLE_BUFFER, doubleBufferMode),
+        __ATTRIB(__DRI_ATTRIB_STEREO, stereoMode),
+        __ATTRIB(__DRI_ATTRIB_AUX_BUFFERS, numAuxBuffers),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_TYPE, transparentPixel),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_INDEX_VALUE, transparentPixel),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_RED_VALUE, transparentRed),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE, transparentGreen),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE, transparentBlue),
+        __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE, transparentAlpha),
+        __ATTRIB(__DRI_ATTRIB_RED_MASK, redMask),
+        __ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask),
+        __ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask),
+        __ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask),
+        __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth),
+        __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight),
+        __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS, maxPbufferPixels),
+        __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH, optimalPbufferWidth),
+        __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT, optimalPbufferHeight),
+        __ATTRIB(__DRI_ATTRIB_SWAP_METHOD, swapMethod),
+        __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB, bindToTextureRgb),
+        __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA, bindToTextureRgba),
+        __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE, bindToMipmapTexture),
+        __ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),};
+
+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
+static void
+setScalar(__GLXconfig * config, unsigned int attrib, unsigned int value)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(attribMap); i++)
+        if (attribMap[i].attrib == attrib) {
+            *(unsigned int *) ((char *) config + attribMap[i].offset) = value;
+            return;
+        }
+}
+
+static __GLXconfig *
+createModeFromConfig(const __DRIcoreExtension * core,
+                     const __DRIconfig * driConfig,
+                     unsigned int visualType, unsigned int drawableType)
+{
+    __GLXDRIconfig *config;
+    unsigned int attrib, value;
+    int i;
+
+    config = malloc(sizeof *config);
+
+    config->driConfig = driConfig;
+
+    i = 0;
+    while (core->indexConfigAttrib(driConfig, i++, &attrib, &value)) {
+        switch (attrib) {
+        case __DRI_ATTRIB_RENDER_TYPE:
+            config->config.renderType = 0;
+            if (value & __DRI_ATTRIB_RGBA_BIT)
+                config->config.renderType |= GLX_RGBA_BIT;
+            if (value & __DRI_ATTRIB_COLOR_INDEX_BIT)
+                config->config.renderType |= GLX_COLOR_INDEX_BIT;
+            break;
+        case __DRI_ATTRIB_CONFIG_CAVEAT:
+            if (value & __DRI_ATTRIB_NON_CONFORMANT_CONFIG)
+                config->config.visualRating = GLX_NON_CONFORMANT_CONFIG;
+            else if (value & __DRI_ATTRIB_SLOW_BIT)
+                config->config.visualRating = GLX_SLOW_CONFIG;
+            else
+                config->config.visualRating = GLX_NONE;
+            break;
+        case __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS:
+            config->config.bindToTextureTargets = 0;
+            if (value & __DRI_ATTRIB_TEXTURE_1D_BIT)
+                config->config.bindToTextureTargets |= GLX_TEXTURE_1D_BIT_EXT;
+            if (value & __DRI_ATTRIB_TEXTURE_2D_BIT)
+                config->config.bindToTextureTargets |= GLX_TEXTURE_2D_BIT_EXT;
+            if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)
+                config->config.bindToTextureTargets |=
+                    GLX_TEXTURE_RECTANGLE_BIT_EXT;
+            break;
+        default:
+            setScalar(&config->config, attrib, value);
+            break;
+        }
+    }
+
+    config->config.next = NULL;
+    config->config.xRenderable = GL_TRUE;
+    config->config.visualType = visualType;
+    config->config.drawableType = drawableType;
+
+    return &config->config;
+}
+
+__GLXconfig *
+glxConvertConfigs(const __DRIcoreExtension * core,
+                  const __DRIconfig ** configs, unsigned int drawableType)
+{
+    __GLXconfig head, *tail;
+    int i;
+
+    tail = &head;
+    head.next = NULL;
+
+    for (i = 0; configs[i]; i++) {
+        tail->next = createModeFromConfig(core,
+                                          configs[i], GLX_TRUE_COLOR,
+                                          drawableType);
+        if (tail->next == NULL)
+            break;
+
+        tail = tail->next;
+    }
+
+    for (i = 0; configs[i]; i++) {
+        tail->next = createModeFromConfig(core,
+                                          configs[i], GLX_DIRECT_COLOR,
+                                          drawableType);
+        if (tail->next == NULL)
+            break;
+
+        tail = tail->next;
+    }
+
+    return head.next;
+}
+
+static const char dri_driver_path[] = DRI_DRIVER_PATH;
+
+void *
+glxProbeDriver(const char *driverName,
+               void **coreExt, const char *coreName, int coreVersion,
+               void **renderExt, const char *renderName, int renderVersion)
+{
+    int i;
+    void *driver;
+    char filename[PATH_MAX];
+    const __DRIextension **extensions;
+
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#define DLLNAME "%s%s_dri_dbg.dll"
+#else
+#define DLLNAME "%s%s_dri.dll"
+#endif
+    snprintf(filename, sizeof filename, DLLNAME,
+             dri_driver_path, driverName);
+
+    driver = LoadLibrary(filename);
+#else
+    snprintf(filename, sizeof filename, "%s/%s_dri.so",
+             dri_driver_path, driverName);
+
+    driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+#endif
+    if (driver == NULL) {
+        LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
+                   filename, dlerror());
+        goto cleanup_failure;
+    }
+
+#ifdef _MSC_VER
+    extensions = (const __DRIextension **)GetProcAddress(driver, __DRI_DRIVER_EXTENSIONS);
+#else
+    extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
+#endif
+    if (extensions == NULL) {
+        LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
+                   driverName, dlerror());
+        goto cleanup_failure;
+    }
+
+    for (i = 0; extensions[i]; i++) {
+        if (strcmp(extensions[i]->name, coreName) == 0 &&
+            extensions[i]->version >= coreVersion) {
+            *coreExt = (void *) extensions[i];
+        }
+
+        if (strcmp(extensions[i]->name, renderName) == 0 &&
+            extensions[i]->version >= renderVersion) {
+            *renderExt = (void *) extensions[i];
+        }
+    }
+
+    if (*coreExt == NULL || *renderExt == NULL) {
+        LogMessage(X_ERROR,
+                   "AIGLX error: %s does not export required DRI extension\n",
+                   driverName);
+        goto cleanup_failure;
+    }
+    return driver;
+
+ cleanup_failure:
+    if (driver)
+#ifdef _MSC_VER
+    FreeLibrary(driver);
+#else
+        dlclose(driver);
+#endif
+    *coreExt = *renderExt = NULL;
+    return NULL;
+}