automake: stop building i915-sw and drop explicit linking to softpipe

Unused and possibly broken. Will be completely removed in
upcomming commits.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/configure.ac b/configure.ac
index 390adaa3159ce223a460e72f3a28e7f16a11e362..9c0c77d3b0a31e2fe325f20a450222fc451af85f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1913,11 +1913,7 @@ if test -n "$with_gallium_drivers"; then
             HAVE_GALLIUM_I915=yes
             PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
             gallium_require_drm_loader
-            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 softpipe"
-            if test "x$MESA_LLVM" = x1; then
-                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-            fi
-            GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
             gallium_check_st "i915/drm" "dri-i915"
             DRICOMMON_NEED_LIBDRM=yes
             ;;
@@ -2057,10 +2053,8 @@ AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes)
 
 AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes -o \
-                                                  "x$HAVE_GALLIUM_I915" = xyes -o \
                                                   "x$HAVE_GALLIUM_SOFTPIPE" = xyes)
-AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_I915" = xyes -o \
-                                                  "x$HAVE_GALLIUM_SOFTPIPE" = xyes \
+AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes \
                                                   && test "x$MESA_LLVM" = x1)
 
 # NOTE: anything using xcb or other client side libs ends up in separate
@@ -2236,7 +2230,6 @@ AC_CONFIG_FILES([Makefile
                src/gallium/winsys/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

diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
index 6abbcaa760499dff4dc2d0e8a64dc3ec24f7e8fe..48256532f5ec261b445740062ae88a726eaeaa0f 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile.am
+++ b/src/gallium/targets/dri-i915/Makefile.am
@@ -27,8 +27,7 @@ AM_CFLAGS = \
 AM_CPPFLAGS = \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
-       -DGALLIUM_GALAHAD \
-       -DGALLIUM_SOFTPIPE
+       -DGALLIUM_GALAHAD
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)
 dri_LTLIBRARIES = i915_dri.la
@@ -42,8 +41,6 @@ i915_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
-       $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \
-       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.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 \
@@ -51,9 +48,4 @@ i915_dri_la_LIBADD = \
        $(GALLIUM_DRI_LIB_DEPS) \
        $(INTEL_LIBS)
 
-if HAVE_MESA_LLVM
-AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-endif
-
 include $(top_srcdir)/install-gallium-links.mk

diff --git a/src/gallium/targets/dri-i915/target.c b/src/gallium/targets/dri-i915/target.c
index 935eb0ebdd7143871927eb1017275795ebd12b65..50efa21b1f795c95d918ea92c3dd1e8646d67b7f 100644 (file)
--- a/src/gallium/targets/dri-i915/target.c
+++ b/src/gallium/targets/dri-i915/target.c
@@ -1,6 +1,5 @@
 
 #include "state_tracker/drm_driver.h"
-#include "target-helpers/inline_wrapper_sw_helper.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
@@ -19,8 +18,6 @@ create_screen(int fd)
    if (!screen)
       return NULL;
 
-   screen = sw_screen_wrap(screen);
-
    screen = debug_screen_wrap(screen);
 
    return screen;

diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am
index 7d7a0b11f7a413c6fd79b5504c380138c9636474..7c4e5ad564c17dd1a4d4601e4cb8aa93c3641081 100644 (file)
--- a/src/gallium/winsys/Makefile.am
+++ b/src/gallium/winsys/Makefile.am
@@ -48,7 +48,7 @@ SUBDIRS += freedreno/drm
 endif
 
 if HAVE_GALLIUM_I915
-SUBDIRS += i915/sw i915/drm
+SUBDIRS += i915/drm
 endif
 
 if HAVE_GALLIUM_ILO