From: Chad Versace Date: Mon, 5 Nov 2018 06:27:54 +0000 (-0800) Subject: turnip: Drop Makefile.am and Android.mk X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c63cb15745919acdd825e0676eb09664a772ef9c;p=mesa.git turnip: Drop Makefile.am and Android.mk The Makefile.am doesn't work. I tried fixing it but gave up because I don't understand Autotools. I strongly suspect the Android.mk also doesn't work. Rather than maintain the broken build files, let's delete them and re-add working build files if-and-when we need them. (Maybe we'll be lucky and turnip will never need to support Autotools!). --- diff --git a/src/freedreno/vulkan/Android.mk b/src/freedreno/vulkan/Android.mk deleted file mode 100644 index f8df7a27f93..00000000000 --- a/src/freedreno/vulkan/Android.mk +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright © 2018 Advanced Micro Devices, Inc. -# Copyright © 2018 Mauro Rossi issor.oruam@gmail.com - -# 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. - -LOCAL_PATH := $(call my-dir) - -# get VULKAN_FILES and VULKAN_GENERATED_FILES -include $(LOCAL_PATH)/Makefile.sources - -# The gallium includes are for the util/u_math.h include from main/macros.h - -TU_COMMON_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/ \ - $(MESA_TOP)/src/vulkan/wsi \ - $(MESA_TOP)/src/vulkan/util \ - $(MESA_TOP)/src/amd \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/compiler \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/mesa/drivers/dri/common \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include \ - frameworks/native/vulkan/include - -TU_SHARED_LIBRARIES := libdrm_amdgpu - -ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) -TU_SHARED_LIBRARIES += libnativewindow -endif - -# -# libmesa_tu_common -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_tu_common -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := \ - $(VULKAN_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions - -$(call mesa-build-with-llvm) - -LOCAL_C_INCLUDES := \ - $(TU_COMMON_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_tu_common,,) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_vulkan_util - -LOCAL_GENERATED_SOURCES += $(intermediates)/tu_entrypoints.c -LOCAL_GENERATED_SOURCES += $(intermediates)/tu_entrypoints.h -LOCAL_GENERATED_SOURCES += $(intermediates)/tu_extensions.c -LOCAL_GENERATED_SOURCES += $(intermediates)/tu_extensions.h -LOCAL_GENERATED_SOURCES += $(intermediates)/vk_format_table.c - -TU_ENTRYPOINTS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/tu_entrypoints_gen.py -TU_EXTENSIONS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/tu_extensions.py -VK_FORMAT_TABLE_SCRIPT := $(MESA_TOP)/src/amd/vulkan/vk_format_table.py -VK_FORMAT_PARSE_SCRIPT := $(MESA_TOP)/src/amd/vulkan/vk_format_parse.py - -vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml -vk_format_layout_csv = $(MESA_TOP)/src/amd/vulkan/vk_format_layout.csv - -$(intermediates)/tu_entrypoints.c: $(TU_ENTRYPOINTS_SCRIPT) \ - $(TU_EXTENSIONS_SCRIPT) \ - $(vulkan_api_xml) - @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(TU_ENTRYPOINTS_SCRIPT) \ - --xml $(vulkan_api_xml) \ - --outdir $(dir $@) - -$(intermediates)/tu_entrypoints.h: $(intermediates)/tu_entrypoints.c - -$(intermediates)/tu_extensions.c: $(TU_EXTENSIONS_SCRIPT) $(vulkan_api_xml) - @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(TU_EXTENSIONS_SCRIPT) \ - --xml $(vulkan_api_xml) \ - --out-c $@ \ - --out-h $(addsuffix .h,$(basename $@)) - -$(intermediates)/tu_extensions.h: $(intermediates)/tu_extensions.c - -$(intermediates)/vk_format_table.c: $(VK_FORMAT_TABLE_SCRIPT) \ - $(VK_FORMAT_PARSE_SCRIPT) \ - $(vk_format_layout_csv) - @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(VK_FORMAT_TABLE_SCRIPT) $(vk_format_layout_csv) > $@ - -LOCAL_SHARED_LIBRARIES += $(TU_SHARED_LIBRARIES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/amd/vulkan \ - $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libvulkan_radeon -# - -include $(CLEAR_VARS) - -LOCAL_MODULE := vulkan.tu -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_LDFLAGS += -Wl,--build-id=sha1 - -LOCAL_SRC_FILES := \ - $(VULKAN_ANDROID_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions - -$(call mesa-build-with-llvm) - -LOCAL_C_INCLUDES := \ - $(TU_COMMON_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_tu_common,,) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/amd/vulkan \ - $(intermediates) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_util \ - libmesa_nir \ - libmesa_glsl \ - libmesa_compiler \ - libmesa_amdgpu_addrlib \ - libmesa_amd_common \ - libmesa_tu_common - -LOCAL_SHARED_LIBRARIES += $(TU_SHARED_LIBRARIES) libz libsync liblog - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/freedreno/vulkan/Makefile.am b/src/freedreno/vulkan/Makefile.am deleted file mode 100644 index 0d4739b3f16..00000000000 --- a/src/freedreno/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) -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 - -tu_entrypoints.c: tu_entrypoints_gen.py tu_extensions.py $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/tu_entrypoints_gen.py \ - --xml $(vulkan_api_xml) \ - --outdir $(builddir) -tu_entrypoints.h: tu_entrypoints.c - -tu_extensions.c: tu_extensions.py \ - $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/tu_extensions.py \ - --xml $(vulkan_api_xml) \ - --out-c tu_extensions.c \ - --out-h tu_extensions.h -tu_extensions.h: tu_extensions.c - -vk_format_table.c: vk_format_table.py \ - vk_format_parse.py \ - vk_format_layout.csv - $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ - -BUILT_SOURCES = $(VULKAN_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json -EXTRA_DIST = \ - $(top_srcdir)/include/vulkan/vk_icd.h \ - tu_entrypoints_gen.py \ - tu_extensions.py \ - tu_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.@host_cpu@.json -# The following is used for development purposes, by setting VK_ICD_FILENAMES. -noinst_DATA = dev_icd.json - -dev_icd.json : tu_extensions.py tu_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/tu_icd.py \ - --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ - -radeon_icd.@host_cpu@.json : tu_extensions.py tu_icd.py - $(AM_V_GEN)$(PYTHON2) $(srcdir)/tu_icd.py \ - --lib-path="${libdir}" --out $@ - -include $(top_srcdir)/install-lib-links.mk diff --git a/src/freedreno/vulkan/Makefile.sources b/src/freedreno/vulkan/Makefile.sources deleted file mode 100644 index 8d64ab65e76..00000000000 --- a/src/freedreno/vulkan/Makefile.sources +++ /dev/null @@ -1,93 +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. - -TU_WS_AMDGPU_FILES := \ - winsys/amdgpu/tu_amdgpu_bo.c \ - winsys/amdgpu/tu_amdgpu_bo.h \ - winsys/amdgpu/tu_amdgpu_cs.c \ - winsys/amdgpu/tu_amdgpu_cs.h \ - winsys/amdgpu/tu_amdgpu_surface.c \ - winsys/amdgpu/tu_amdgpu_surface.h \ - winsys/amdgpu/tu_amdgpu_winsys.c \ - winsys/amdgpu/tu_amdgpu_winsys.h \ - winsys/amdgpu/tu_amdgpu_winsys_public.h - -VULKAN_FILES := \ - tu_cmd_buffer.c \ - tu_cs.h \ - tu_debug.c \ - tu_debug.h \ - tu_device.c \ - tu_descriptor_set.c \ - tu_descriptor_set.h \ - tu_formats.c \ - tu_image.c \ - tu_meta.c \ - tu_meta.h \ - tu_meta_blit.c \ - tu_meta_blit2d.c \ - tu_meta_buffer.c \ - tu_meta_bufimage.c \ - tu_meta_clear.c \ - tu_meta_copy.c \ - tu_meta_decompress.c \ - tu_meta_fast_clear.c \ - tu_meta_resolve.c \ - tu_meta_resolve_cs.c \ - tu_meta_resolve_fs.c \ - tu_nir_to_llvm.c \ - tu_llvm_helper.cpp \ - tu_pass.c \ - tu_pipeline.c \ - tu_pipeline_cache.c \ - tu_private.h \ - tu_radeon_winsys.h \ - tu_shader.c \ - tu_shader_info.c \ - tu_shader.h \ - tu_shader_helper.h \ - tu_query.c \ - tu_util.c \ - tu_util.h \ - tu_wsi.c \ - si_cmd_buffer.c \ - vk_format.h \ - $(TU_WS_AMDGPU_FILES) - -VULKAN_ANDROID_FILES := \ - tu_android.c - -VULKAN_WSI_WAYLAND_FILES := \ - tu_wsi_wayland.c - -VULKAN_WSI_X11_FILES := \ - tu_wsi_x11.c - -VULKAN_WSI_DISPLAY_FILES := \ - tu_wsi_display.c - -VULKAN_GENERATED_FILES := \ - tu_entrypoints.c \ - tu_entrypoints.h \ - tu_extensions.c \ - tu_extensions.h \ - vk_format_table.c -