diff options
author | Emil Velikov <[email protected]> | 2015-03-14 22:36:25 +0000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2015-03-21 17:16:27 +0000 |
commit | 48c7461d5a0d5cb0f3df5025d7849d27e73a80b3 (patch) | |
tree | bda9fe55500b4129b123f63eb5e17e1ff5efa3f2 /src/gallium/targets | |
parent | e8039208c4a771b0c1fb8a44623bcf0261508f87 (diff) |
st/gbm: remove state-tracker
st/egl was its only user.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 95 | ||||
-rwxr-xr-x | src/gallium/targets/gbm/gallium-gbm-symbols-check | 13 | ||||
-rw-r--r-- | src/gallium/targets/gbm/gbm.sym | 6 | ||||
-rw-r--r-- | src/gallium/targets/gbm/target.c | 1 |
4 files changed, 0 insertions, 115 deletions
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am deleted file mode 100644 index aaf75807644..00000000000 --- a/src/gallium/targets/gbm/Makefile.am +++ /dev/null @@ -1,95 +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_TARGET_CFLAGS) - -gbmdir = $(libdir)/gbm -gbm_LTLIBRARIES = gbm_gallium_drm.la - -nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp -gbm_gallium_drm_la_SOURCES = - -gbm_gallium_drm_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -gbm_gallium_drm_la_LDFLAGS = \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -gbm_gallium_drm_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym -endif - -EXTRA_gbm_gallium_drm_la_DEPENDENCIES = gbm.sym -EXTRA_DIST = gallium-gbm-symbols-check gbm.sym - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la - -include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc -include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc - -gbm_gallium_drm_la_SOURCES += target.c -gbm_gallium_drm_la_CPPFLAGS = $(TARGET_CPPFLAGS) -gbm_gallium_drm_la_LIBADD += $(TARGET_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS -gbm_gallium_drm_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(GALLIUM_PIPE_LOADER_LIBS) - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_MESA_LLVM -gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) -gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -TESTS = gallium-gbm-symbols-check diff --git a/src/gallium/targets/gbm/gallium-gbm-symbols-check b/src/gallium/targets/gbm/gallium-gbm-symbols-check deleted file mode 100755 index 52b20ab858b..00000000000 --- a/src/gallium/targets/gbm/gallium-gbm-symbols-check +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -FUNCS=$(nm -D --defined-only ${1-.libs/gbm_gallium_drm.so} | egrep -o "T .*|D .*" | cut -c 3- | while read func; do -( grep -q "^$func$" || echo $func ) <<EOF -gbm_backend -_edata -_fini -_init -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" diff --git a/src/gallium/targets/gbm/gbm.sym b/src/gallium/targets/gbm/gbm.sym deleted file mode 100644 index d5fa0b9a8d2..00000000000 --- a/src/gallium/targets/gbm/gbm.sym +++ /dev/null @@ -1,6 +0,0 @@ -{ - global: - gbm_backend; - local: - *; -}; diff --git a/src/gallium/targets/gbm/target.c b/src/gallium/targets/gbm/target.c deleted file mode 100644 index fde4a4a7dcf..00000000000 --- a/src/gallium/targets/gbm/target.c +++ /dev/null @@ -1 +0,0 @@ -#include "target-helpers/inline_drm_helper.h" |