diff options
| author | Emil Velikov <[email protected]> | 2014-06-19 00:28:49 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-06-19 12:37:14 +0100 |
| commit | 6984e8db91da0725127f1d66bede54e074a32e8c (patch) | |
| tree | 627fbb51a54568210b9bdfeb871680edcdbf50f6 /src/gallium/targets | |
| parent | 25182e249e50b0fce41d975ae2b3c9cbdb8d0ef3 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri-i915/Makefile.am | 10 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i915/target.c | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index 6abbcaa7604..48256532f5e 100644 --- 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 935eb0ebdd7..50efa21b1f7 100644 --- 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; |