summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-05-01 15:20:48 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2015-05-01 15:20:48 +0000
commitcf2fe3de1453c7c69ca107bfb98fdd750944f6c3 (patch)
tree4a86221a6673c013ffd86a3641da4ea45b6c1742
parent17cdfcc3ed5a0e92a3da51853674a9043c8336ea (diff)
downloadmesa-baserock/james/test.tar.gz
Revert "egl: remove egl_gallium from the loader"baserock/james/test
This reverts commit 363b53f00069af718f64cf047f19ad5681a8bf6d.
-rw-r--r--src/egl/main/egldriver.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 7ad14d32a7e..ca2be32407d 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -524,6 +524,19 @@ _eglAddUserDriver(void)
/**
+ * Add egl_gallium to the module array.
+ */
+static void
+_eglAddGalliumDriver(void)
+{
+#ifndef _EGL_BUILT_IN_DRIVER_GALLIUM
+ void *external = (void *) "egl_gallium";
+ _eglPreloadForEach(_eglGetSearchPath(), _eglLoaderFile, external);
+#endif
+}
+
+
+/**
* Add built-in drivers to the module array.
*/
static void
@@ -555,6 +568,7 @@ _eglAddDrivers(void)
* Add other drivers only when EGL_DRIVER is not set. The order here
* decides the priorities.
*/
+ _eglAddGalliumDriver();
_eglAddBuiltInDrivers();
}