diff --git a/Android.mk b/Android.mk index fb29105a608..33f1d141131 100644 --- a/Android.mk +++ b/Android.mk @@ -24,7 +24,7 @@ # BOARD_GPU_DRIVERS should be defined. The valid values are # # classic drivers: i915 i965 -# gallium drivers: swrast freedreno i915g ilo nouveau r300g r600g radeonsi vc4 virgl vmwgfx +# gallium drivers: swrast freedreno i915g nouveau r300g r600g radeonsi vc4 virgl vmwgfx # # The main target is libGLES_mesa. For each classic driver enabled, a DRI # module will also be built. DRI modules will be loaded by libGLES_mesa. @@ -50,7 +50,7 @@ MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON2 := python classic_drivers := i915 i965 -gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx vc4 virgl +gallium_drivers := swrast freedreno i915g nouveau r300g r600g radeonsi vmwgfx vc4 virgl MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS)) diff --git a/Makefile.am b/Makefile.am index 4f2e698708f..84c3e1d08ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-llvm-shared-libs \ --with-egl-platforms=x11,wayland,drm,surfaceless \ --with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \ - --with-gallium-drivers=i915,ilo,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr,etnaviv,imx \ + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr,etnaviv,imx \ --with-vulkan-drivers=intel,radeon ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 3eaa2f05918..7cb2c40778e 100644 --- a/configure.ac +++ b/configure.ac @@ -1238,7 +1238,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,ilo,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" + "i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" @<:@default=r300,r600,svga,swrast@:>@])], [with_gallium_drivers="$withval"], [with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"]) @@ -2307,11 +2307,6 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) require_libdrm "Gallium i915" ;; - xilo) - HAVE_GALLIUM_ILO=yes - PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) - require_libdrm "Gallium i965/ilo" - ;; xr300) HAVE_GALLIUM_R300=yes PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) @@ -2471,7 +2466,6 @@ 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) @@ -2527,9 +2521,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$MESA_LLVM" = x1 -a \ "x$enable_gallium_llvm" = xyes) AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes) -if test "x$USE_VC4_SIMULATOR" = xyes -a "x$HAVE_GALLIUM_ILO" = xyes; then - AC_MSG_ERROR([VC4 simulator on x86 replaces i965 driver build, so ilo must be disabled.]) -fi AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_libdrm" = xyes) AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes) @@ -2621,7 +2612,6 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/freedreno/Makefile src/gallium/drivers/ddebug/Makefile src/gallium/drivers/i915/Makefile - src/gallium/drivers/ilo/Makefile src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/noop/Makefile src/gallium/drivers/nouveau/Makefile diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html index 1b5535b95b2..e9f08f8ef89 100644 --- a/docs/relnotes/17.1.0.html +++ b/docs/relnotes/17.1.0.html @@ -54,7 +54,8 @@ Note: some of the new features are only available with certain drivers.

Changes

-TBD. +The Gallium3D Intel driver 'ilo' has been considered unmaintained for awhile +now. This release finally drops it for maintainability. diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 2b469b65ee4..e67cfab5b31 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -48,11 +48,6 @@ ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/i915/drm drivers/i915 endif -# ilo -ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),) -SUBDIRS += winsys/intel/drm drivers/ilo -endif - # nouveau ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) SUBDIRS += \ diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index f910f3187eb..38da63b0690 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -27,11 +27,6 @@ if HAVE_GALLIUM_I915 SUBDIRS += drivers/i915 winsys/i915/drm endif -## ilo/i965 -if HAVE_GALLIUM_ILO -SUBDIRS += drivers/ilo winsys/intel/drm -endif - ## nouveau if HAVE_GALLIUM_NOUVEAU SUBDIRS += drivers/nouveau winsys/nouveau/drm diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index b78fb721a1b..7a783f43716 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -85,8 +85,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 950a46420c5..dec8f055410 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -53,11 +53,6 @@ gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915 LOCAL_SHARED_LIBRARIES += libdrm_intel LOCAL_CFLAGS += -DGALLIUM_I915 endif -ifneq ($(filter ilo,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_winsys_intel libmesa_pipe_ilo -LOCAL_SHARED_LIBRARIES += libdrm_intel -LOCAL_CFLAGS += -DGALLIUM_ILO -endif ifneq ($(filter nouveau,$(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_winsys_nouveau libmesa_pipe_nouveau LOCAL_CFLAGS += -DGALLIUM_NOUVEAU diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index bca747faa4a..50c273376f6 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -75,8 +75,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 7bcf9905d80..f805c4be2a9 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -90,20 +90,6 @@ pipe_i915_la_LIBADD = \ endif -if HAVE_GALLIUM_ILO -pipe_LTLIBRARIES += pipe_i965.la - -pipe_i965_la_SOURCES = pipe_i965.c -nodist_EXTRA_pipe_i965_la_SOURCES = dummy.cpp -pipe_i965_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(LIBDRM_LIBS) \ - $(INTEL_LIBS) - -endif - if HAVE_GALLIUM_NOUVEAU pipe_LTLIBRARIES += pipe_nouveau.la diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index cd065fc11c7..83a05230ff8 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -64,8 +64,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc