diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gallium/targets/dri-ilo/Makefile.am | 52 | ||||
| -rw-r--r-- | src/gallium/targets/dri-ilo/target.c | 44 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 9 |
5 files changed, 10 insertions, 104 deletions
diff --git a/configure.ac b/configure.ac index a358c10cbe8..9e5efcbfd8f 100644 --- a/configure.ac +++ b/configure.ac @@ -1933,7 +1933,7 @@ if test -n "$with_gallium_drivers"; then 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" "xa/ilo" + gallium_check_st "intel/drm" "dri/ilo" "xa/ilo" ;; xr300) HAVE_GALLIUM_R300=yes @@ -2208,7 +2208,6 @@ AC_CONFIG_FILES([Makefile src/gallium/state_trackers/xa/Makefile src/gallium/state_trackers/xvmc/Makefile src/gallium/targets/Makefile - src/gallium/targets/dri-ilo/Makefile src/gallium/targets/dri-swrast/Makefile src/gallium/targets/dri-vmwgfx/Makefile src/gallium/targets/dri/Makefile diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 5452886ff1c..3e5d8e736d3 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -64,12 +64,6 @@ SUBDIRS += dri-vmwgfx endif endif -if HAVE_GALLIUM_ILO -if HAVE_DRI2 -SUBDIRS += dri-ilo -endif -endif - if HAVE_GALLIUM_SOFTPIPE if HAVE_DRISW SUBDIRS += dri-swrast diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am deleted file mode 100644 index 41eab06bcdb..00000000000 --- a/src/gallium/targets/dri-ilo/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -# 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_DRI_CFLAGS) -AM_CPPFLAGS = \ - -DGALLIUM_RBUG \ - -DGALLIUM_TRACE \ - -DGALLIUM_GALAHAD - -dridir = $(DRI_DRIVER_INSTALL_DIR) -dri_LTLIBRARIES = ilo_dri.la - -nodist_EXTRA_ilo_dri_la_SOURCES = dummy.cpp -ilo_dri_la_SOURCES = target.c - -ilo_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) - -ilo_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/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) - -include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-ilo/target.c b/src/gallium/targets/dri-ilo/target.c deleted file mode 100644 index 3ce75e96b2e..00000000000 --- a/src/gallium/targets/dri-ilo/target.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "intel/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_winsys_create_for_fd(fd); - if (!iws) - return NULL; - - screen = ilo_screen_create(iws); - if (!screen) { - intel_winsys_destroy(iws); - return NULL; - } - - screen = debug_screen_wrap(screen); - - return screen; -} - - -static const struct drm_conf_ret share_fd_ret = { - .type = DRM_CONF_BOOL, - .val.val_int = true, -}; - -static const struct drm_conf_ret *drm_configuration(enum drm_conf conf) -{ - switch (conf) { - case DRM_CONF_SHARE_FD: - return &share_fd_ret; - default: - break; - } - return NULL; -} - -DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, drm_configuration) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 1a520a21dd1..613b798c393 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -59,6 +59,15 @@ STATIC_TARGET_LIB_DEPS += \ $(INTEL_LIBS) endif +if HAVE_GALLIUM_ILO +MEGADRIVERS += ilo +STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ + $(INTEL_LIBS) +endif + if HAVE_GALLIUM_NOUVEAU MEGADRIVERS += nouveau STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU |