summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-06-09 11:47:18 -0600
committerBrian Paul <[email protected]>2008-06-09 12:28:07 -0600
commit50d59c8be1e409f0f96ba5c59d74eb5ff8c35b6a (patch)
tree6b6609be98b99d2d64cf4fefd080350aa60f8d2e /src
parent1954f49a171036c633614450e591307833421aca (diff)
egl: choose between DRI and softpipe drivers
Diffstat (limited to 'src')
-rw-r--r--src/egl/main/eglx.c58
1 files changed, 55 insertions, 3 deletions
diff --git a/src/egl/main/eglx.c b/src/egl/main/eglx.c
index 085da33e7dc..63ad5a7074f 100644
--- a/src/egl/main/eglx.c
+++ b/src/egl/main/eglx.c
@@ -1,3 +1,30 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
+ *
+ **************************************************************************/
+
/**
* X-specific EGL code.
@@ -8,22 +35,34 @@
#include <assert.h>
#include <stdio.h>
+#include <stdlib.h>
#include <X11/Xlib.h>
+
+#include "egldriver.h"
+#include "egllog.h"
+#include "eglstring.h"
#include "eglx.h"
-static const char *DefaultXDriver = "softpipe_egl";
+static const char *DefaultDRIDriver = "egl_xdri";
+static const char *DefaultSoftDriver = "softpipe_egl";
/**
* Given an X Display ptr (at dpy->Xdpy) try to determine the appropriate
* device driver. Return its name.
+ *
+ * This boils down to whether to use the egl_xdri.so driver which will
+ * load a DRI driver or the egl_softpipe.so driver that'll do software
+ * rendering on Xlib.
*/
const char *
_xeglChooseDriver(_EGLDisplay *dpy)
{
#ifdef _EGL_PLATFORM_X
_XPrivDisplay xdpy;
+ int screen;
+ const char *driverName;
assert(dpy);
@@ -38,9 +77,22 @@ _xeglChooseDriver(_EGLDisplay *dpy)
assert(dpy->Xdpy);
- printf("%s\n", xdpy->display_name);
+ screen = DefaultScreen(dpy->Xdpy);
+
+ /* See if we can choose a DRI/DRM driver */
+ driverName = _eglChooseDRMDriver(screen);
+ if (driverName) {
+ /* DRI is available */
+ free((void *) driverName);
+ driverName = _eglstrdup(DefaultDRIDriver);
+ }
+ else {
+ driverName = _eglstrdup(DefaultSoftDriver);
+ }
+
+ _eglLog(_EGL_DEBUG, "_xeglChooseDriver: %s", driverName);
- return DefaultXDriver; /* XXX temporary */
+ return driverName;
#else
return NULL;
#endif