From 231063b03234e078c63da10c65f070799f945156 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 16 Jun 2014 02:54:56 +0100 Subject: [PATCH] targets/dri-freedreno: Convert to static/shared pipe-drivers Now we don't need a second dri module when using kgsl :) Cc: Rob Clark Signed-off-by: Emil Velikov Tested-by: Rob Clark Tested-by: Thomas Helland Acked-by: Tom Stellard --- configure.ac | 3 +- src/gallium/targets/Makefile.am | 6 -- src/gallium/targets/dri-freedreno/Makefile.am | 59 ------------------- .../targets/dri-freedreno/target-kgsl.c | 20 ------- .../targets/dri-freedreno/target-msm.c | 20 ------- src/gallium/targets/dri/Makefile.am | 11 ++++ 6 files changed, 12 insertions(+), 107 deletions(-) delete mode 100644 src/gallium/targets/dri-freedreno/Makefile.am delete mode 100644 src/gallium/targets/dri-freedreno/target-kgsl.c delete mode 100644 src/gallium/targets/dri-freedreno/target-msm.c diff --git a/configure.ac b/configure.ac index 925c380c247..b7e90d7ccf8 100644 --- a/configure.ac +++ b/configure.ac @@ -1981,7 +1981,7 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([FREEDRENO], [libdrm_freedreno >= $LIBDRM_FREEDRENO_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS freedreno" - gallium_check_st "freedreno/drm" "dri-freedreno" "xa/freedreno" "" "" + gallium_check_st "freedreno/drm" "dri/freedreno" "xa/freedreno" "" "" ;; xswrast) HAVE_GALLIUM_SOFTPIPE=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-freedreno/Makefile src/gallium/targets/dri-i915/Makefile src/gallium/targets/dri-ilo/Makefile src/gallium/targets/dri-swrast/Makefile diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 8d6f555734c..d2f22bfa237 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_FREEDRENO -if HAVE_DRI2 -SUBDIRS += dri-freedreno -endif -endif - if HAVE_GALLIUM_I915 if HAVE_DRI2 SUBDIRS += dri-i915 diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am deleted file mode 100644 index 23db169d81c..00000000000 --- a/src/gallium/targets/dri-freedreno/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# 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_NOOP - -dridir = $(DRI_DRIVER_INSTALL_DIR) -dri_LTLIBRARIES = kgsl_dri.la msm_dri.la - -COMMON_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) - -COMMON_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/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ - $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ - $(GALLIUM_DRI_LIB_DEPS) \ - $(LIBDRM_LIBS) \ - $(FREEDRENO_LIBS) - -nodist_EXTRA_kgsl_dri_la_SOURCES = dummy.cpp -kgsl_dri_la_SOURCES = target-kgsl.c -kgsl_dri_la_LDFLAGS = $(COMMON_LDFLAGS) -kgsl_dri_la_LIBADD = $(COMMON_LIBADD) - -nodist_EXTRA_msm_dri_la_SOURCES = dummy.cpp -msm_dri_la_SOURCES = target-msm.c -msm_dri_la_LDFLAGS = $(COMMON_LDFLAGS) -msm_dri_la_LIBADD = $(COMMON_LIBADD) - -include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/dri-freedreno/target-kgsl.c b/src/gallium/targets/dri-freedreno/target-kgsl.c deleted file mode 100644 index dcaf299a05b..00000000000 --- a/src/gallium/targets/dri-freedreno/target-kgsl.c +++ /dev/null @@ -1,20 +0,0 @@ - -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "freedreno/drm/freedreno_drm_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct pipe_screen *screen; - - screen = fd_drm_screen_create(fd); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("freedreno", "kgsl", create_screen, NULL) diff --git a/src/gallium/targets/dri-freedreno/target-msm.c b/src/gallium/targets/dri-freedreno/target-msm.c deleted file mode 100644 index 4a6299becb9..00000000000 --- a/src/gallium/targets/dri-freedreno/target-msm.c +++ /dev/null @@ -1,20 +0,0 @@ - -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "freedreno/drm/freedreno_drm_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct pipe_screen *screen; - - screen = fd_drm_screen_create(fd); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("freedreno", "msm", create_screen, NULL) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index a57ef01e68c..e4d9a7e9794 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -92,6 +92,17 @@ STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ $(RADEON_LIBS) endif + +if HAVE_GALLIUM_FREEDRENO +MEGADRIVERS += freedreno +STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ + $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ + $(FREEDRENO_LIBS) + +endif + gallium_dri_la_SOURCES += target.c AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)