diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/gallium/drivers/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gallium/targets/dri-ilo/Makefile.am | 77 | ||||
| -rw-r--r-- | src/gallium/targets/dri-ilo/target.c | 28 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 28 | ||||
| -rw-r--r-- | src/gallium/winsys/Makefile.am | 4 |
8 files changed, 171 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 06d9fc9f0b0..0123c99c895 100644 --- a/configure.ac +++ b/configure.ac @@ -652,7 +652,7 @@ GALLIUM_DRIVERS_DEFAULT="r300,r600,svga,swrast" AC_ARG_WITH([gallium-drivers], [AS_HELP_STRING([--with-gallium-drivers@<:@=DIRS...@:>@], [comma delimited Gallium drivers list, e.g. - "i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast" + "i915,ilo,nouveau,r300,r600,radeonsi,freedreno,svga,swrast" @<:@default=r300,r600,svga,swrast@:>@])], [with_gallium_drivers="$withval"], [with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"]) @@ -1767,6 +1767,13 @@ if test "x$with_gallium_drivers" != x; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw" gallium_check_st "i915/drm" "dri-i915" "xorg-i915" ;; + xilo) + HAVE_GALLIUM_ILO=yes + PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) + gallium_require_drm_loader + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS ilo" + gallium_check_st "intel/drm" "dri-ilo" + ;; xr300) HAVE_GALLIUM_R300=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) @@ -1888,6 +1895,7 @@ fi AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_I915, test "x$HAVE_GALLIUM_I915" = xyes) +AM_CONDITIONAL(HAVE_GALLIUM_ILO, test "x$HAVE_GALLIUM_ILO" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_R300, test "x$HAVE_GALLIUM_R300" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_R600, test "x$HAVE_GALLIUM_R600" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_RADEONSI, test "x$HAVE_GALLIUM_RADEONSI" = xyes) @@ -2003,6 +2011,7 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/Makefile src/gallium/drivers/freedreno/Makefile src/gallium/drivers/i915/Makefile + src/gallium/drivers/ilo/Makefile src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/nouveau/Makefile src/gallium/drivers/nv30/Makefile @@ -2033,6 +2042,7 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/Makefile src/gallium/targets/dri-freedreno/Makefile src/gallium/targets/dri-i915/Makefile + src/gallium/targets/dri-ilo/Makefile src/gallium/targets/dri-nouveau/Makefile src/gallium/targets/dri-r300/Makefile src/gallium/targets/dri-r600/Makefile @@ -2066,6 +2076,7 @@ AC_CONFIG_FILES([Makefile src/gallium/winsys/freedreno/drm/Makefile src/gallium/winsys/i915/drm/Makefile src/gallium/winsys/i915/sw/Makefile + src/gallium/winsys/intel/drm/Makefile src/gallium/winsys/nouveau/drm/Makefile src/gallium/winsys/radeon/drm/Makefile src/gallium/winsys/svga/drm/Makefile diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index 25c680a033b..22f54b7ad0c 100644 --- a/src/gallium/drivers/Makefile.am +++ b/src/gallium/drivers/Makefile.am @@ -76,6 +76,14 @@ endif ################################################################################ +if HAVE_GALLIUM_ILO + +SUBDIRS += ilo + +endif + +################################################################################ + if HAVE_GALLIUM_NOUVEAU SUBDIRS += nouveau nv30 nv50 nvc0 diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index b3e9cbcd018..ff0982140ff 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -64,6 +64,12 @@ SUBDIRS += xorg-i915 endif endif +if HAVE_GALLIUM_ILO +if HAVE_DRI +SUBDIRS += dri-ilo +endif +endif + if HAVE_GALLIUM_R300 if HAVE_DRI SUBDIRS += dri-r300 diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am new file mode 100644 index 00000000000..7761f338cba --- /dev/null +++ b/src/gallium/targets/dri-ilo/Makefile.am @@ -0,0 +1,77 @@ +# Copyright © 2012 Intel Corporation +# Copyright © 2013 LunarG, Inc. +# +# 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, sublicense, +# 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 +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS 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. + +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ + $(LIBDRM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mapi \ + -I$(top_builddir)/src/mesa/drivers/dri/common \ + -DGALLIUM_RBUG \ + -DGALLIUM_TRACE \ + -DGALLIUM_GALAHAD + +noinst_LTLIBRARIES = ilo_dri.la + +ilo_dri_la_SOURCES = \ + target.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + +# need -rpath to create a noinst shared library +ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \ + -rpath $(abs_builddir) + +ilo_dri_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ + $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ + $(GALLIUM_DRI_LIB_DEPS) \ + $(INTEL_LIBS) + +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_ilo_dri_la_SOURCES = dummy-cpp.cpp + +if HAVE_MESA_LLVM +ilo_dri_la_LDFLAGS += $(LLVM_LDFLAGS) +ilo_dri_la_LIBADD += $(LLVM_LIBS) +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: ilo_dri.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/ilo_dri.so + ln -sf ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i965_dri.so diff --git a/src/gallium/targets/dri-ilo/target.c b/src/gallium/targets/dri-ilo/target.c new file mode 100644 index 00000000000..c27cb4745c7 --- /dev/null +++ b/src/gallium/targets/dri-ilo/target.c @@ -0,0 +1,28 @@ +#include "state_tracker/drm_driver.h" +#include "target-helpers/inline_debug_helper.h" +#include "intel/drm/intel_drm_public.h" +#include "intel/drm/intel_winsys.h" +#include "ilo/ilo_public.h" + +static struct pipe_screen * +create_screen(int fd) +{ + 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) { + iws->destroy(iws); + return NULL; + } + + screen = debug_screen_wrap(screen); + + return screen; +} + +DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, NULL) 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) diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am index 70387f8058e..ab1acc37b4a 100644 --- a/src/gallium/winsys/Makefile.am +++ b/src/gallium/winsys/Makefile.am @@ -51,6 +51,10 @@ if HAVE_GALLIUM_I915 SUBDIRS += i915/sw i915/drm endif +if HAVE_GALLIUM_ILO +SUBDIRS += intel/drm +endif + if HAVE_GALLIUM_NOUVEAU SUBDIRS += nouveau/drm endif |