2 files changed, 36 insertions, 0 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 31dbc791ddc..789aa30d60d 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -149,6 +149,14 @@ egl_gallium_la_LIBADD += \
 	$(INTEL_LIBS)
 endif
 
+if HAVE_GALLIUM_ILO
+AM_CPPFLAGS += -D_EGL_PIPE_ILO=1
+egl_gallium_la_LIBADD += \
+	$(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \
+	$(top_builddir)/src/gallium/drivers/ilo/libilo.la \
+	$(INTEL_LIBS)
+endif
+
 if HAVE_GALLIUM_NOUVEAU
 AM_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1
 egl_gallium_la_LIBADD += \
diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c
index e05490b5580..7f35f6c645e 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -33,6 +33,9 @@
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
 #include "target-helpers/inline_wrapper_sw_helper.h"
+/* for ilo */
+#include "intel/drm/intel_drm_public.h"
+#include "ilo/ilo_public.h"
 /* for nouveau */
 #include "nouveau/drm/nouveau_drm_public.h"
 /* for r300 */
@@ -72,6 +75,29 @@ pipe_i915_create_screen(int fd)
 }
 
 static struct pipe_screen *
+pipe_ilo_create_screen(int fd)
+{
+#if _EGL_PIPE_ILO
+   struct intel_winsys *iws;
+   struct pipe_screen *screen;
+
+   iws = intel_drm_winsys_create(fd);
+   if (!iws)
+      return NULL;
+
+   screen = ilo_screen_create(iws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+#else
+   return NULL;
+#endif
+}
+
+static struct pipe_screen *
 pipe_nouveau_create_screen(int fd)
 {
 #if _EGL_PIPE_NOUVEAU
@@ -204,6 +230,8 @@ egl_pipe_create_drm_screen(const char *name, int fd)
 {
    if (strcmp(name, "i915") == 0)
       return pipe_i915_create_screen(fd);
+   else if (strcmp(name, "i965") == 0)
+      return pipe_ilo_create_screen(fd);
    else if (strcmp(name, "nouveau") == 0)
       return pipe_nouveau_create_screen(fd);
    else if (strcmp(name, "r300") == 0)