From d1a0faffc3fde42b030f3eb18d6f31c10dfdc8f6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 29 May 2008 17:01:19 -0600
Subject: egl: use softpipe_egl driver by default

---
 src/egl/main/eglx.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/egl/main/eglx.c')

diff --git a/src/egl/main/eglx.c b/src/egl/main/eglx.c
index 4b33080f1a..085da33e7d 100644
--- a/src/egl/main/eglx.c
+++ b/src/egl/main/eglx.c
@@ -12,6 +12,8 @@
 #include "eglx.h"
 
 
+static const char *DefaultXDriver = "softpipe_egl";
+
 
 /**
  * Given an X Display ptr (at dpy->Xdpy) try to determine the appropriate
@@ -21,14 +23,24 @@ const char *
 _xeglChooseDriver(_EGLDisplay *dpy)
 {
 #ifdef _EGL_PLATFORM_X
-   _XPrivDisplay xdpy = (_XPrivDisplay) dpy->Xdpy;
+   _XPrivDisplay xdpy;
 
    assert(dpy);
+
+   if (!dpy->Xdpy) {
+      dpy->Xdpy = XOpenDisplay(NULL);
+      if (!dpy->Xdpy) {
+         /* can't open X display -> can't use X-based driver */
+         return NULL;
+      }
+   }
+   xdpy = (_XPrivDisplay) dpy->Xdpy;
+
    assert(dpy->Xdpy);
 
    printf("%s\n", xdpy->display_name);
 
-   return "foo"; /* XXX todo */
+   return DefaultXDriver; /* XXX temporary */
 #else
    return NULL;
 #endif
-- 
cgit v1.2.3