summaryrefslogtreecommitdiffstats
path: root/src/amd
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2019-04-08 12:44:17 -0700
committerDylan Baker <[email protected]>2019-04-15 13:44:29 -0700
commit95aefc94a941701616fda0776a3bd15710c8c151 (patch)
treebced9cf424ee7eb0cf753503eaace7cec4f62b50 /src/amd
parentde0c97c8171f8a8183b94d8ac6997117c4671da8 (diff)
Delete autotools
Acked-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Acked-by: Marek Olšák <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Acked-by: Bas Nieuwenhuizen <[email protected]> Acked-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/amd')
-rw-r--r--src/amd/Makefile.addrlib.am40
-rw-r--r--src/amd/Makefile.am35
-rw-r--r--src/amd/Makefile.common.am71
-rw-r--r--src/amd/vulkan/Makefile.am200
4 files changed, 0 insertions, 346 deletions
diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am
deleted file mode 100644
index 6de0e487f69..00000000000
--- a/src/amd/Makefile.addrlib.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016 Red Hat 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.
-
-ADDRLIB_LIBS = addrlib/libamdgpu_addrlib.la
-
-addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
- $(DEFINES) \
- -I$(top_srcdir)/src/ \
- -I$(top_srcdir)/include \
- -I$(srcdir)/common \
- -I$(srcdir)/addrlib/inc \
- -I$(srcdir)/addrlib/src \
- -I$(srcdir)/addrlib/src/core \
- -I$(srcdir)/addrlib/src/chip/gfx9 \
- -I$(srcdir)/addrlib/src/chip/r800
-
-addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
- $(VISIBILITY_CXXFLAGS) $(CXX11_CXXFLAGS)
-
-noinst_LTLIBRARIES += $(ADDRLIB_LIBS)
-
-addrlib_libamdgpu_addrlib_la_SOURCES = $(ADDRLIB_FILES)
diff --git a/src/amd/Makefile.am b/src/amd/Makefile.am
deleted file mode 100644
index 39cf0741ad9..00000000000
--- a/src/amd/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2016 Red Hat.
-#
-# 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 Makefile.sources
-
-noinst_LTLIBRARIES =
-
-include Makefile.addrlib.am
-include Makefile.common.am
-
-EXTRA_DIST = \
- $(COMMON_HEADER_FILES) \
- common/sid_tables.py \
- meson.build \
- addrlib/meson.build \
- common/meson.build \
- vulkan/meson.build
diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
deleted file mode 100644
index 453d23c3ac9..00000000000
--- a/src/amd/Makefile.common.am
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright © 2016 Bas Nieuwenhuizen
-#
-# 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.
-
-if HAVE_GALLIUM_LLVM
-
-COMMON_LIBS = common/libamd_common.la
-
-# TODO cleanup these
-common_libamd_common_la_CPPFLAGS = \
- $(AMDGPU_CFLAGS) \
- $(VALGRIND_CFLAGS) \
- $(DEFINES) \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src/amd/common \
- -I$(top_srcdir)/src/amd/common \
- -I$(top_builddir)/src/compiler \
- -I$(top_builddir)/src/compiler/nir \
- -I$(top_srcdir)/src/compiler \
- -I$(top_srcdir)/src/mapi \
- -I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/mesa/drivers/dri/common \
- -I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/gallium/include
-
-common_libamd_common_la_CFLAGS = \
- $(VISIBILITY_CFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(LLVM_CFLAGS) \
- $(LIBELF_CFLAGS)
-
-common_libamd_common_la_CXXFLAGS = \
- $(VISIBILITY_CXXFLAGS) \
- $(LLVM_CXXFLAGS)
-
-noinst_LTLIBRARIES += $(COMMON_LIBS)
-
-common_libamd_common_la_SOURCES = \
- $(AMD_COMMON_FILES) \
- $(AMD_COMPILER_FILES) \
- $(AMD_DEBUG_FILES) \
- $(AMD_GENERATED_FILES) \
- $(AMD_NIR_FILES)
-endif
-
-common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
-
-common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
- $(AM_V_at)$(MKDIR_P) $(@D)
- $(AM_V_GEN) $(PYTHON) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
-
-BUILT_SOURCES = $(AMD_GENERATED_FILES)
diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
deleted file mode 100644
index 2522171dacf..00000000000
--- a/src/amd/vulkan/Makefile.am
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright © 2016 Red Hat
-#
-# 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 Makefile.sources
-
-noinst_HEADERS = \
- $(top_srcdir)/include/vulkan/vk_platform.h \
- $(top_srcdir)/include/vulkan/vulkan_core.h \
- $(top_srcdir)/include/vulkan/vulkan_wayland.h \
- $(top_srcdir)/include/vulkan/vulkan_xcb.h \
- $(top_srcdir)/include/vulkan/vulkan_xlib.h \
- $(top_srcdir)/include/vulkan/vulkan.h
-
-lib_LTLIBRARIES = libvulkan_radeon.la
-
-# The gallium includes are for the util/u_math.h include from main/macros.h
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/vulkan/wsi \
- -I$(top_builddir)/src/vulkan/util \
- -I$(top_srcdir)/src/vulkan/util \
- -I$(top_srcdir)/src/amd \
- -I$(top_srcdir)/src/amd/common \
- -I$(top_builddir)/src/compiler \
- -I$(top_builddir)/src/compiler/nir \
- -I$(top_srcdir)/src/compiler \
- -I$(top_srcdir)/src/mapi \
- -I$(top_srcdir)/src/mesa \
- -I$(top_srcdir)/src/mesa/drivers/dri/common \
- -I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/gallium/include \
- $(AMDGPU_CFLAGS) \
- $(VALGRIND_CFLAGS) \
- $(DEFINES)
-
-AM_CFLAGS = \
- $(VISIBILITY_CFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(LLVM_CFLAGS)
-
-AM_CXXFLAGS = \
- $(VISIBILITY_CXXFLAGS) \
- $(LLVM_CXXFLAGS)
-
-VULKAN_SOURCES = \
- $(VULKAN_GENERATED_FILES) \
- $(VULKAN_FILES)
-
-VULKAN_LIB_DEPS = \
- libvulkan_common.la \
- $(top_builddir)/src/vulkan/libvulkan_util.la \
- $(top_builddir)/src/vulkan/libvulkan_wsi.la \
- $(top_builddir)/src/amd/common/libamd_common.la \
- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la \
- $(top_builddir)/src/compiler/nir/libnir.la \
- $(top_builddir)/src/util/libmesautil.la \
- $(LLVM_LIBS) \
- $(LIBELF_LIBS) \
- $(PTHREAD_LIBS) \
- $(AMDGPU_LIBS) \
- $(LIBDRM_LIBS) \
- $(PTHREAD_LIBS) \
- $(DLOPEN_LIBS) \
- -lm
-
-if HAVE_PLATFORM_DRM
-AM_CPPFLAGS += \
- -DVK_USE_PLATFORM_DISPLAY_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES)
-endif
-
-if HAVE_XLIB_LEASE
-AM_CPPFLAGS += \
- -DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
- $(XCB_RANDR_CFLAGS) \
- $(XLIB_RANDR_CFLAGS)
-
-VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS)
-endif
-
-if HAVE_PLATFORM_X11
-AM_CPPFLAGS += \
- $(XCB_DRI3_CFLAGS) \
- -DVK_USE_PLATFORM_XCB_KHR \
- -DVK_USE_PLATFORM_XLIB_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
-
-VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
-endif
-
-
-if HAVE_PLATFORM_WAYLAND
-AM_CPPFLAGS += \
- $(WAYLAND_CLIENT_CFLAGS) \
- -DVK_USE_PLATFORM_WAYLAND_KHR
-
-VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
-
-VULKAN_LIB_DEPS += \
- $(WAYLAND_CLIENT_LIBS)
-endif
-
-if HAVE_PLATFORM_ANDROID
-AM_CPPFLAGS += $(ANDROID_CPPFLAGS) -DVK_USE_PLATFORM_ANDROID_KHR
-AM_CFLAGS += $(ANDROID_CFLAGS)
-VULKAN_LIB_DEPS += $(ANDROID_LIBS)
-VULKAN_SOURCES += $(VULKAN_ANDROID_FILES)
-endif
-
-noinst_LTLIBRARIES = libvulkan_common.la
-libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
-
-nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp
-libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES)
-
-vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
-
-radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
- $(MKDIR_GEN)
- $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \
- --xml $(vulkan_api_xml) \
- --outdir $(builddir)
-radv_entrypoints.h: radv_entrypoints.c
-
-radv_extensions.c: radv_extensions.py \
- $(vulkan_api_xml)
- $(MKDIR_GEN)
- $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \
- --xml $(vulkan_api_xml) \
- --out-c radv_extensions.c \
- --out-h radv_extensions.h
-radv_extensions.h: radv_extensions.c
-
-vk_format_table.c: vk_format_table.py \
- vk_format_parse.py \
- vk_format_layout.csv
- $(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
-
-BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
-CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@[email protected]
-EXTRA_DIST = \
- $(top_srcdir)/include/vulkan/vk_icd.h \
- radv_entrypoints_gen.py \
- radv_extensions.py \
- radv_icd.py \
- vk_format_layout.csv \
- vk_format_parse.py \
- vk_format_table.py \
- meson.build
-
-libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
-
-libvulkan_radeon_la_LDFLAGS = \
- -shared \
- -module \
- -no-undefined \
- -avoid-version \
- $(BSYMBOLIC) \
- $(LLVM_LDFLAGS) \
- $(GC_SECTIONS) \
- $(LD_NO_UNDEFINED)
-
-
-icdconfdir = @VULKAN_ICD_INSTALL_DIR@
-icdconf_DATA = radeon_icd.@[email protected]
-# The following is used for development purposes, by setting VK_ICD_FILENAMES.
-noinst_DATA = dev_icd.json
-
-dev_icd.json : radv_extensions.py radv_icd.py
- $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
- --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
-
-radeon_icd.@[email protected] : radv_extensions.py radv_icd.py
- $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
- --lib-path="${libdir}" --out $@
-
-include $(top_srcdir)/install-lib-links.mk