diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/dri-i915/Makefile.am | 10 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i915/target.c | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/Makefile.am | 2 |
3 files changed, 2 insertions, 13 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; diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am index 7d7a0b11f7a..7c4e5ad564c 100644 --- 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 |