diff options
| author | Chia-I Wu <[email protected]> | 2012-12-13 06:01:23 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2013-04-26 16:20:52 +0800 |
| commit | 5816a471afc2e98968bb332cd96526c42d429285 (patch) | |
| tree | 589bfe8f51edd8bd8c6026a95b698170b7406c8c /src/gallium/targets/egl-static | |
| parent | 825aa60707d620745ff3c1b6e43976977c81c2a9 (diff) | |
ilo: add the driver to the build system
Add ilo to targets/egl-static and add a new target dri-ilo. Update autoconf
and automake rules.
Diffstat (limited to 'src/gallium/targets/egl-static')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 28 |
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) |