diff options
Diffstat (limited to 'src')
135 files changed, 0 insertions, 9126 deletions
diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 1eda3e581ae..00000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright © 2013 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. - -.PHONY: git_sha1.h -git_sha1.h: - @echo "updating $@" - @$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@ - -BUILT_SOURCES = git_sha1.h -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = meson.build - -SUBDIRS = . gtest util mapi/glapi/gen mapi - -if HAVE_OPENGL -gldir = $(includedir)/GL -gl_HEADERS = \ - $(top_srcdir)/include/GL/gl.h \ - $(top_srcdir)/include/GL/glext.h \ - $(top_srcdir)/include/GL/glcorearb.h \ - $(top_srcdir)/include/GL/gl_mangle.h -endif - -# TODO: When building with glvnd, glvnd itself should be providing gl.pc and the headers -if HAVE_GLX -glxdir = $(includedir)/GL -glx_HEADERS = \ - $(top_srcdir)/include/GL/glx.h \ - $(top_srcdir)/include/GL/glxext.h \ - $(top_srcdir)/include/GL/glx_mangle.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = mesa/gl.pc -endif - -if HAVE_COMMON_OSMESA -osmesadir = $(includedir)/GL -osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h -endif - -# include only conditionally ? -SUBDIRS += compiler - -## Optionally required by EGL -if HAVE_PLATFORM_WAYLAND -SUBDIRS += egl/wayland/wayland-drm -endif - -if HAVE_VULKAN_COMMON -SUBDIRS += vulkan -endif - -EXTRA_DIST += vulkan/registry/vk.xml - -if HAVE_AMD_DRIVERS -SUBDIRS += amd -endif - -if HAVE_INTEL_DRIVERS -SUBDIRS += intel -endif - -if HAVE_BROADCOM_DRIVERS -SUBDIRS += broadcom -endif - -if HAVE_FREEDRENO_DRIVERS -SUBDIRS += freedreno -endif - -if NEED_OPENGL_COMMON -SUBDIRS += mesa -endif - -SUBDIRS += loader - -if HAVE_DRI_GLX -SUBDIRS += glx -endif - -## Optionally required by EGL (aka PLATFORM_GBM) -if HAVE_GBM -SUBDIRS += gbm -endif - -if HAVE_EGL -SUBDIRS += egl -endif - -# Requires wayland-drm -if HAVE_RADEON_VULKAN -SUBDIRS += amd/vulkan -endif - -if HAVE_GALLIUM -SUBDIRS += gallium -endif - -EXTRA_DIST += \ - getopt hgl SConscript \ - $(top_srcdir)/include/GL/mesa_glinterop.h - -AM_CFLAGS = $(VISIBILITY_CFLAGS) -AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include/ \ - -I$(top_srcdir)/src/mapi/ \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - $(DEFINES) - -noinst_LTLIBRARIES = libglsl_util.la - -libglsl_util_la_SOURCES = \ - mesa/main/extensions_table.c \ - mesa/main/imports.c \ - mesa/program/prog_parameter.c \ - mesa/program/symbol_table.c \ - mesa/program/dummy_errors.c - -EXTRA_DIST += \ - tools/imgui/imconfig.h \ - tools/imgui/imgui.cpp \ - tools/imgui/imgui.h \ - tools/imgui/imgui_draw.cpp \ - tools/imgui/imgui_demo.cpp \ - tools/imgui/imgui_internal.h \ - tools/imgui/imgui_memory_editor.h \ - tools/imgui/stb_rect_pack.h \ - tools/imgui/stb_textedit.h \ - tools/imgui/stb_truetype.h \ - tools/imgui/README \ - tools/imgui/LICENSE.txt \ - tools/imgui/meson.build 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.@host_cpu@.json -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.@host_cpu@.json -# 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.@host_cpu@.json : 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 diff --git a/src/broadcom/Makefile.am b/src/broadcom/Makefile.am deleted file mode 100644 index 061afe67bfe..00000000000 --- a/src/broadcom/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright © 2016 Broadcom -# Copyright © 2016 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_srcdir)/src/broadcom/ \ - -I$(top_srcdir)/src/broadcom/cle \ - -I$(top_srcdir)/src/broadcom/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/include \ - $(VALGRIND_CFLAGS) \ - $(DEFINES) - -AM_CFLAGS = \ - $(EXPAT_CFLAGS) - -include Makefile.sources - -lib_LTLIBRARIES = -check_LTLIBRARIES = -noinst_DATA = -noinst_HEADERS = -noinst_LTLIBRARIES = -noinst_PROGRAMS = -check_PROGRAMS = -TESTS = -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = \ - $(BROADCOM_FILES) \ - meson.build \ - cle/meson.build \ - compiler/meson.build \ - qpu/meson.build - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -include Makefile.genxml.am -include Makefile.cle.am -include Makefile.v3d.am - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/broadcom/Makefile.cle.am b/src/broadcom/Makefile.cle.am deleted file mode 100644 index 1c262d03966..00000000000 --- a/src/broadcom/Makefile.cle.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES += cle/libbroadcom_cle.la - -cle_libbroadcom_cle_la_CFLAGS = \ - -I$(top_builddir)/src/broadcom/cle \ - $(AM_CFLAGS) -cle_libbroadcom_cle_la_SOURCES = $(BROADCOM_DECODER_FILES) diff --git a/src/broadcom/Makefile.genxml.am b/src/broadcom/Makefile.genxml.am deleted file mode 100644 index 8828207d2aa..00000000000 --- a/src/broadcom/Makefile.genxml.am +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright © 2016 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. - -BUILT_SOURCES += $(BROADCOM_GENXML_GENERATED_FILES) - -EXTRA_DIST += $(BROADCOM_GENXML_XML_FILES) -EXTRA_DIST += $(BROADCOM_GENXML_GENERATED_FILES) - -SUFFIXES = _pack.h .xml - -$(BROADCOM_GENXML_GENERATED_FILES): cle/gen_pack_header.py - -cle/v3d_packet_v21_pack.h: $(srcdir)/cle/v3d_packet_v21.xml $(srcdir)/cle/gen_pack_header.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 21 > $@ || ($(RM) $@; false) - -cle/v3d_packet_v33_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 33 > $@ || ($(RM) $@; false) - -cle/v3d_packet_v41_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 41 > $@ || ($(RM) $@; false) - -cle/v3d_packet_v42_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 42 > $@ || ($(RM) $@; false) - -GEN_ZIPPED = $(srcdir)/../intel/genxml/gen_zipped_file.py -cle/v3d_xml.h: $(GEN_ZIPPED) $(BROADCOM_GENXML_XML_FILES) - $(MKDIR_GEN) - $(PYTHON_GEN) $(GEN_ZIPPED) $(BROADCOM_GENXML_XML_FILES:%=$(srcdir)/%) > $@ || ($(RM) $@; false) - -EXTRA_DIST += \ - cle/gen_pack_header.py \ - $() diff --git a/src/broadcom/Makefile.v3d.am b/src/broadcom/Makefile.v3d.am deleted file mode 100644 index 97ef2d7455e..00000000000 --- a/src/broadcom/Makefile.v3d.am +++ /dev/null @@ -1,32 +0,0 @@ -noinst_LTLIBRARIES += libbroadcom.la -noinst_LTLIBRARIES += libbroadcom_v33.la -noinst_LTLIBRARIES += libbroadcom_v41.la -noinst_LTLIBRARIES += libbroadcom_v42.la - -if USE_V3D_SIMULATOR -AM_CFLAGS += $(V3D_SIMULATOR_CFLAGS) -libbroadcom_la_LDFLAGS = $(V3D_SIMULATOR_LIBS) -endif - -libbroadcom_v33_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES) -libbroadcom_v33_la_CFLAGS = -DV3D_VERSION=33 - -libbroadcom_v41_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES) -libbroadcom_v41_la_CFLAGS = -DV3D_VERSION=41 - -libbroadcom_v42_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES) -libbroadcom_v42_la_CFLAGS = -DV3D_VERSION=42 - -libbroadcom_la_SOURCES = $(BROADCOM_FILES) - -check_PROGRAMS += \ - qpu/tests/qpu_disasm \ - $(NULL) - -LDADD = \ - libbroadcom.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(NULL) - -TESTS += $(check_PROGRAMS) diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am deleted file mode 100644 index 05cdb1446c0..00000000000 --- a/src/compiler/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright © 2012 Jon TURNEY -# Copyright (C) 2015 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 Makefile.sources - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_builddir)/src/compiler/glsl\ - -I$(top_srcdir)/src/compiler/glsl\ - -I$(top_srcdir)/src/compiler/glsl/glcpp\ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/spirv \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gtest/include \ - $(VALGRIND_CFLAGS) \ - $(DEFINES) - -AM_CFLAGS = \ - $(VISIBILITY_CFLAGS) \ - $(WNO_OVERRIDE_INIT) \ - $(MSVC2013_COMPAT_CFLAGS) - -AM_CXXFLAGS = \ - $(VISIBILITY_CXXFLAGS) \ - $(MSVC2013_COMPAT_CXXFLAGS) - -noinst_LTLIBRARIES = libcompiler.la - -libcompiler_la_SOURCES = $(LIBCOMPILER_FILES) - -noinst_PROGRAMS = -check_PROGRAMS = -TESTS = -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = \ - SConscript \ - glsl/glcpp/meson.build \ - glsl/tests/meson.build \ - glsl/meson.build \ - nir/meson.build \ - spirv/meson.build \ - meson.build - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -include Makefile.spirv.am - -include Makefile.glsl.am - -include Makefile.nir.am diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am deleted file mode 100644 index 007af4769af..00000000000 --- a/src/compiler/Makefile.glsl.am +++ /dev/null @@ -1,272 +0,0 @@ -# -# Copyright © 2012 Jon TURNEY -# Copyright (C) 2015 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. - -EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \ - glsl/TODO glsl/glcpp/README \ - glsl/glsl_lexer.ll \ - glsl/glsl_parser.yy \ - glsl/ir_expression_operation.py \ - glsl/glcpp/glcpp-lex.l \ - glsl/glcpp/glcpp-parse.y \ - glsl/xxd.py \ - glsl/float64.glsl \ - SConscript.glsl - -TESTS += glsl/glcpp/tests/glcpp-test.sh \ - glsl/tests/blob-test \ - glsl/tests/cache-test \ - glsl/tests/general-ir-test \ - glsl/tests/optimization-test.sh \ - glsl/tests/sampler-types-test \ - glsl/tests/uniform-initializer-test \ - glsl/tests/warnings-test.sh - -TESTS_ENVIRONMENT= \ - export abs_builddir=$(abs_builddir); \ - export PYTHON=$(PYTHON); \ - export PYTHON_FLAGS=$(PYTHON_FLAGS); - -check_PROGRAMS += \ - glsl/glcpp/glcpp \ - glsl/glsl_test \ - glsl/tests/blob-test \ - glsl/tests/cache-test \ - glsl/tests/general-ir-test \ - glsl/tests/sampler-types-test \ - glsl/tests/uniform-initializer-test - -noinst_PROGRAMS += glsl_compiler - -glsl_tests_blob_test_SOURCES = \ - glsl/tests/blob_test.c -glsl_tests_blob_test_LDADD = \ - glsl/libglsl.la - -glsl_tests_cache_test_SOURCES = \ - glsl/tests/cache_test.c -glsl_tests_cache_test_CFLAGS = \ - $(PTHREAD_CFLAGS) -glsl_tests_cache_test_LDADD = \ - glsl/libglsl.la \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) - -glsl_tests_general_ir_test_SOURCES = \ - glsl/tests/array_refcount_test.cpp \ - glsl/tests/builtin_variable_test.cpp \ - glsl/tests/invalidate_locations_test.cpp \ - glsl/tests/general_ir_test.cpp \ - glsl/tests/lower_int64_test.cpp \ - glsl/tests/opt_add_neg_to_sub_test.cpp \ - glsl/tests/varyings_test.cpp -glsl_tests_general_ir_test_CFLAGS = \ - $(PTHREAD_CFLAGS) -glsl_tests_general_ir_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - glsl/libglsl.la \ - glsl/libstandalone.la \ - $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) - -glsl_tests_uniform_initializer_test_SOURCES = \ - glsl/tests/copy_constant_to_storage_tests.cpp \ - glsl/tests/set_uniform_initializer_tests.cpp \ - glsl/tests/uniform_initializer_utils.cpp \ - glsl/tests/uniform_initializer_utils.h -glsl_tests_uniform_initializer_test_CFLAGS = \ - $(PTHREAD_CFLAGS) -glsl_tests_uniform_initializer_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - glsl/libglsl.la \ - $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) - -glsl_tests_sampler_types_test_SOURCES = \ - glsl/tests/sampler_types_test.cpp -glsl_tests_sampler_types_test_CFLAGS = \ - $(PTHREAD_CFLAGS) -glsl_tests_sampler_types_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - glsl/libglsl.la \ - $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) - -noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la glsl/libstandalone.la - -glsl_libglcpp_la_LIBADD = \ - $(top_builddir)/src/util/libmesautil.la -glsl_libglcpp_la_SOURCES = \ - glsl/glcpp/glcpp-lex.c \ - glsl/glcpp/glcpp-parse.c \ - glsl/glcpp/glcpp-parse.h \ - $(LIBGLCPP_FILES) - -glsl_glcpp_glcpp_SOURCES = \ - glsl/glcpp/glcpp.c -glsl_glcpp_glcpp_LDADD = \ - glsl/libglcpp.la \ - $(top_builddir)/src/libglsl_util.la \ - -lm - -glsl_libglsl_la_LIBADD = \ - nir/libnir.la \ - glsl/libglcpp.la - -glsl_libglsl_la_SOURCES = \ - $(LIBGLSL_GENERATED_FILES) \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_SHADER_CACHE_FILES) - -glsl_libstandalone_la_SOURCES = \ - $(GLSL_COMPILER_CXX_FILES) - -glsl_libstandalone_la_LIBADD = \ - glsl/libglsl.la \ - $(top_builddir)/src/libglsl_util.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) - -glsl_compiler_SOURCES = \ - glsl/main.cpp - -glsl_compiler_LDADD = \ - glsl/libstandalone.la \ - $(CLOCK_LIB) - -glsl_glsl_test_SOURCES = \ - glsl/test.cpp \ - glsl/test_optpass.cpp \ - glsl/test_optpass.h - -glsl_glsl_test_LDADD = \ - glsl/libglsl.la \ - glsl/libstandalone.la \ - $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) - -# We write our own rules for yacc and lex below. We'd rather use automake, -# but automake makes it especially difficult for a number of reasons: -# -# * < automake-1.12 generates .h files from .yy and .ypp files, but -# >=automake-1.12 generates .hh and .hpp files respectively. There's no -# good way of making a project that uses C++ yacc files compatible with -# both versions of automake. Strong work automake developers. -# -# * Since we're generating code from .l/.y files in a subdirectory (glcpp/) -# we'd like the resulting generated code to also go in glcpp/ for purposes -# of distribution. Automake gives no way to do this. -# -# * Since we're building multiple yacc parsers into one library (and via one -# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes -# automake to name the resulting generated code as <library-name>_filename.c. -# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file. - -# In order to make build output print "LEX" and "YACC", we reproduce the -# automake variables below. - -AM_V_LEX = $(am__v_LEX_$(V)) -am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) -am__v_LEX_0 = @echo " LEX " $@; -am__v_LEX_1 = - -AM_V_YACC = $(am__v_YACC_$(V)) -am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) -am__v_YACC_0 = @echo " YACC " $@; -am__v_YACC_1 = - -YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS) -LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS) - -glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy - $(MKDIR_GEN) - $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy - -glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll - $(MKDIR_GEN) - $(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll - -glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y - $(MKDIR_GEN) - $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y - -glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l - $(MKDIR_GEN) - $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l - -glsl/ir_expression_operation.h: glsl/ir_expression_operation.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false) - -glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false) - -glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false) - -glsl/float64_glsl.h: glsl/xxd.py glsl/float64.glsl - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/glsl/xxd.py $(srcdir)/glsl/float64.glsl $@ -n float64_source || ($(RM) $@; false) - -# Only the parsers (specifically the header files generated at the same time) -# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is -# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files -# YACC is only executed once for each parser. The rest of the generated code -# will be created at the appropriate times according to standard automake -# dependency rules. -BUILT_SOURCES += \ - glsl/float64_glsl.h \ - glsl/glsl_parser.cpp \ - glsl/glsl_lexer.cpp \ - glsl/ir_expression_operation.h \ - glsl/ir_expression_operation_constant.h \ - glsl/ir_expression_operation_strings.h \ - glsl/glcpp/glcpp-parse.c \ - glsl/glcpp/glcpp-lex.c -CLEANFILES += \ - glsl/float64_glsl.h \ - glsl/glcpp/glcpp-parse.h \ - glsl/glsl_parser.h \ - glsl/glsl_parser.cpp \ - glsl/glsl_lexer.cpp \ - glsl/ir_expression_operation.h \ - glsl/ir_expression_operation_constant.h \ - glsl/ir_expression_operation_strings.h \ - glsl/glcpp/glcpp-parse.c \ - glsl/glcpp/glcpp-lex.c - -clean-local: - $(RM) glsl/tests/lower_jumps/*.opt_test - $(RM) glsl/tests/lower_jumps/*.expected - $(RM) glsl/tests/lower_jumps/*.out - $(RM) glsl/tests/warnings/*.out - $(RM) glsl/glcpp/tests/*.out - $(RM) -r glsl/glcpp/tests/subtest*/ - $(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr - -dist-hook: - $(RM) glsl/glcpp/tests/*.out - $(RM) glsl/glcpp/tests/subtest*/*.out diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am deleted file mode 100644 index aa0a92856f1..00000000000 --- a/src/compiler/Makefile.nir.am +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright © 2012 Jon TURNEY -# Copyright (C) 2015 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. - -noinst_LTLIBRARIES += nir/libnir.la - -nir_libnir_la_LIBADD = \ - libcompiler.la - -nir_libnir_la_SOURCES = \ - $(NIR_FILES) \ - $(SPIRV_FILES) \ - $(SPIRV_GENERATED_FILES) \ - $(NIR_GENERATED_FILES) - -nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py nir/nir_intrinsics.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false) - -nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false) - -nir/nir_intrinsics.h: nir/nir_intrinsics.py nir/nir_intrinsics_h.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_h.py --outdir nir || ($(RM) $@; false) - -nir/nir_intrinsics.c: nir/nir_intrinsics.py nir/nir_intrinsics_c.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_c.py --outdir nir || ($(RM) $@; false) - -nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false) - -nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@ || ($(RM) $@; false) - -nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false) - -check_PROGRAMS += \ - nir/tests/control_flow_tests \ - nir/tests/vars_tests - -NIR_TESTS_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir -NIR_TESTS_CFLAGS = \ - $(PTHREAD_CFLAGS) -NIR_TESTS_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) - - -nir_tests_control_flow_tests_CPPFLAGS = $(NIR_TESTS_CPPFLAGS) -nir_tests_control_flow_tests_SOURCES = nir/tests/control_flow_tests.cpp -nir_tests_control_flow_tests_CFLAGS = $(NIR_TESTS_CFLAGS) -nir_tests_control_flow_tests_LDADD = $(NIR_TESTS_LDADD) - -nir_tests_vars_tests_CPPFLAGS = $(NIR_TESTS_CPPFLAGS) -nir_tests_vars_tests_SOURCES = nir/tests/vars_tests.cpp -nir_tests_vars_tests_CFLAGS = $(NIR_TESTS_CFLAGS) -nir_tests_vars_tests_LDADD = $(NIR_TESTS_LDADD) - -check_SCRIPTS = nir/tests/algebraic_parser_test.sh - -TESTS += \ - nir/tests/control_flow_tests \ - nir/tests/vars_tests \ - nir/tests/algebraic_parser_test.sh - - -BUILT_SOURCES += \ - $(NIR_GENERATED_FILES) - -CLEANFILES += \ - $(NIR_GENERATED_FILES) - -EXTRA_DIST += \ - nir/nir_algebraic.py \ - nir/nir_builder_opcodes_h.py \ - nir/nir_constant_expressions.py \ - nir/nir_intrinsics.py \ - nir/nir_intrinsics_c.py \ - nir/nir_intrinsics_h.py \ - nir/nir_opcodes.py \ - nir/nir_opcodes_c.py \ - nir/nir_opcodes_h.py \ - nir/nir_opt_algebraic.py \ - nir/tests \ - nir/README \ - SConscript.nir \ - SConscript.spirv diff --git a/src/compiler/Makefile.spirv.am b/src/compiler/Makefile.spirv.am deleted file mode 100644 index 2ac97f30acf..00000000000 --- a/src/compiler/Makefile.spirv.am +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2017 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. - -spirv/spirv_info.c: spirv/spirv_info_c.py spirv/spirv.core.grammar.json - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/spirv/spirv_info_c.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false) - -spirv/vtn_gather_types.c: spirv/vtn_gather_types_c.py spirv/spirv.core.grammar.json - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/spirv/vtn_gather_types_c.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false) - -noinst_PROGRAMS += spirv2nir - -spirv2nir_SOURCES = \ - spirv/spirv2nir.c - -spirv2nir_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/spirv - -spirv2nir_LDADD = \ - nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - -lm \ - $(PTHREAD_LIBS) - -nodist_EXTRA_spirv2nir_SOURCES = dummy.cpp - -BUILT_SOURCES += \ - $(SPIRV_GENERATED_FILES) - -CLEANFILES += \ - $(SPIRV_GENERATED_FILES) - -EXTRA_DIST += \ - spirv/spirv_info_c.py \ - spirv/spirv.core.grammar.json \ - spirv/vtn_gather_types_c.py diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am deleted file mode 100644 index 349779feb4e..00000000000 --- a/src/egl/Makefile.am +++ /dev/null @@ -1,238 +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 Makefile.sources - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) - -BUILT_SOURCES = - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/egl/main \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(EGL_CFLAGS) \ - -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) - -# Depending on whether libglvnd is enabled, we'll build the EGL library as -# either libEGL.so.1 or libEGL_mesa.so.0. Using an automake substitution -# in the variable names breaks "make dist" target, so use a conenience library -# instead. -noinst_LTLIBRARIES = libEGL_common.la -libEGL_common_la_SOURCES = \ - $(LIBEGL_C_FILES) - -libEGL_common_la_LIBADD = \ - $(top_builddir)/src/util/libmesautil.la \ - $(EGL_LIB_DEPS) - -dri2_backend_FILES = -dri2_backend_GENERATED_FILES = -dri3_backend_FILES = - -if HAVE_PLATFORM_X11 -AM_CFLAGS += $(XCB_DRI2_CFLAGS) -libEGL_common_la_LIBADD += $(XCB_DRI2_LIBS) -dri2_backend_FILES += drivers/dri2/platform_x11.c - -if HAVE_DRI3 -dri3_backend_FILES += \ - drivers/dri2/platform_x11_dri3.c \ - drivers/dri2/platform_x11_dri3.h - -libEGL_common_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la -endif -endif - -WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml - -drivers/dri2/linux-dmabuf-unstable-v1-protocol.c: $(WL_DMABUF_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@ - -drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@ - -if HAVE_PLATFORM_WAYLAND -drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h -drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h -drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h - -AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) -libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS) -libEGL_common_la_LIBADD += $(LIBDRM_LIBS) -AM_CFLAGS += $(WAYLAND_EGL_CFLAGS) -libEGL_common_la_LIBADD += $(WAYLAND_EGL_LIBS) -AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS) -libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la -libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS) -dri2_backend_FILES += \ - drivers/dri2/platform_wayland.c -dri2_backend_GENERATED_FILES += \ - drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \ - drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h -endif - -if HAVE_PLATFORM_DRM -libEGL_common_la_LIBADD += $(top_builddir)/src/gbm/libgbm.la -dri2_backend_FILES += drivers/dri2/platform_drm.c -endif - -if HAVE_PLATFORM_SURFACELESS -dri2_backend_FILES += drivers/dri2/platform_surfaceless.c -endif - -if HAVE_PLATFORM_ANDROID -AM_CFLAGS += $(ANDROID_CFLAGS) -libEGL_common_la_LIBADD += $(ANDROID_LIBS) -dri2_backend_FILES += drivers/dri2/platform_android.c -endif - -AM_CFLAGS += \ - -I$(top_srcdir)/src/loader \ - -I$(top_builddir)/src/egl/drivers/dri2 \ - -I$(top_srcdir)/src/egl/drivers/dri2 \ - -I$(top_srcdir)/src/gbm/backends/dri \ - -I$(top_builddir)/src/egl/wayland/wayland-drm \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm - -nodist_libEGL_common_la_SOURCES = \ - $(dri2_backend_GENERATED_FILES) - -libEGL_common_la_SOURCES += \ - $(dri2_backend_core_FILES) \ - $(dri2_backend_FILES) \ - $(dri3_backend_FILES) - -libEGL_common_la_LIBADD += \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libxmlconfig.la \ - $(DLOPEN_LIBS) \ - $(LIBDRM_LIBS) \ - $(CLOCK_LIB) - -# dummy rule to keep dist happy -$(top_scrdir)/src/mapi/new/genCommon.py: - -GLVND_GEN_EGL_DEPS = \ - generate/gen_egl_dispatch.py \ - generate/eglFunctionList.py \ - generate/egl.xml \ - generate/egl_other.xml - -GLVND_GEN_DEPS = $(top_scrdir)/src/mapi/new/genCommon.py \ - $(GLVND_GEN_EGL_DEPS) - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) -g_egldispatchstubs.c: $(GLVND_GEN_DEPS) - $(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \ - $(top_srcdir)/src/egl/generate/egl.xml \ - $(top_srcdir)/src/egl/generate/egl_other.xml > $@ - -g_egldispatchstubs.h: $(GLVND_GEN_DEPS) - $(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py header \ - $(top_srcdir)/src/egl/generate/egl.xml \ - $(top_srcdir)/src/egl/generate/egl_other.xml > $@ - -BUILT_SOURCES += g_egldispatchstubs.c g_egldispatchstubs.h - -CLEANFILES = \ - $(BUILT_SOURCES) \ - $(dri2_backend_GENERATED_FILES) - -if USE_LIBGLVND -AM_CFLAGS += \ - $(GLVND_CFLAGS) - -vendorjsondir = @LIBGLVND_DATADIR@/glvnd/egl_vendor.d -vendorjson_DATA = main/50_mesa.json - -lib_LTLIBRARIES = libEGL_mesa.la -libEGL_mesa_la_SOURCES = \ - main/eglglvnd.c \ - main/egldispatchstubs.h \ - main/egldispatchstubs.c \ - g_egldispatchstubs.c \ - g_egldispatchstubs.h -libEGL_mesa_la_LIBADD = \ - libEGL_common.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la -libEGL_mesa_la_LDFLAGS = \ - -no-undefined \ - -version-number 0 \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -else # USE_LIBGLVND - -lib_LTLIBRARIES = libEGL@EGL_LIB_SUFFIX@.la -libEGL@EGL_LIB_SUFFIX@_la_SOURCES = -libEGL@EGL_LIB_SUFFIX@_la_LIBADD = \ - libEGL_common.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la -libEGL@EGL_LIB_SUFFIX@_la_LDFLAGS = \ - -no-undefined \ - -version-number 1:0 \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -endif # USE_LIBGLVND - -include $(top_srcdir)/install-lib-links.mk - -# TODO: When building with glvnd, glvnd itself should be providing egl.pc and the headers -pkgconfigdir = $(libdir)/pkgconfig - -pkgconfig_DATA = main/egl.pc - -egldir = $(includedir)/EGL -egl_HEADERS = \ - $(top_srcdir)/include/EGL/eglext.h \ - $(top_srcdir)/include/EGL/egl.h \ - $(top_srcdir)/include/EGL/eglextchromium.h \ - $(top_srcdir)/include/EGL/eglmesaext.h \ - $(top_srcdir)/include/EGL/eglplatform.h - -TESTS = egl-entrypoint-check - -if USE_LIBGLVND -#TODO: glvnd symbol check -else -TESTS += egl-symbols-check -endif - -EXTRA_DIST = \ - $(TESTS) \ - SConscript \ - drivers/haiku \ - main/egl.def \ - main/README.txt \ - $(GLVND_GEN_EGL_DEPS) \ - main/50_mesa.json \ - meson.build diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am deleted file mode 100644 index 40174c6acdd..00000000000 --- a/src/egl/wayland/wayland-drm/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AM_CFLAGS = -I$(top_srcdir)/include \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(WAYLAND_SERVER_CFLAGS) - -if HAVE_PLATFORM_WAYLAND -wayland-drm.lo: wayland-drm-client-protocol.h wayland-drm-server-protocol.h -endif - -noinst_LTLIBRARIES = libwayland-drm.la - -nodist_libwayland_drm_la_SOURCES = \ - wayland-drm-protocol.c \ - wayland-drm-client-protocol.h \ - wayland-drm-server-protocol.h - -libwayland_drm_la_SOURCES = \ - wayland-drm.c \ - wayland-drm.h - -noinst_HEADERS = wayland-drm.h - -EXTRA_DIST = wayland-drm.xml meson.build - -CLEANFILES = \ - wayland-drm-protocol.c \ - wayland-drm-client-protocol.h \ - wayland-drm-server-protocol.h - -%-protocol.c : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@ - -%-server-protocol.h : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@ - -%-client-protocol.h : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@ diff --git a/src/freedreno/Makefile.am b/src/freedreno/Makefile.am deleted file mode 100644 index 342f03d644c..00000000000 --- a/src/freedreno/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright © 2016 Broadcom -# Copyright © 2016 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/freedreno/ \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/include \ - $(DEFINES) - -AM_CFLAGS = \ - $(EXPAT_CFLAGS) - -include Makefile.sources - -lib_LTLIBRARIES = -check_LTLIBRARIES = -noinst_DATA = -noinst_HEADERS = $(registers_FILES) -noinst_LTLIBRARIES = -noinst_PROGRAMS = -check_PROGRAMS = -TESTS = -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = \ - meson.build \ - drm/meson.build \ - ir3/ir3_nir_trig.py \ - ir3/meson.build - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -CLEANFILES += $(BUILT_SOURCES) - -noinst_LTLIBRARIES += libfreedreno_drm.la - -libfreedreno_drm_la_SOURCES = $(drm_SOURCES) -libfreedreno_drm_la_CFLAGS = $(VALGRIND_CFLAGS) $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES += libfreedreno_ir3.la - -libfreedreno_ir3_la_SOURCES = $(ir3_SOURCES) $(ir3_GENERATED_FILES) -libfreedreno_ir3_la_CFLAGS = \ - -I$(top_srcdir)/src/freedreno/ir3 \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir - -ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py - $(MKDIR_GEN) - $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false) - diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc deleted file mode 100644 index 329c8839e17..00000000000 --- a/src/gallium/Automake.inc +++ /dev/null @@ -1,90 +0,0 @@ -GALLIUM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - $(DEFINES) - -# src/gallium/auxiliary must appear before src/gallium/drivers -# because there are stupidly two rbug_context.h files in -# different directories, and which one is included by the -# preprocessor is determined by the ordering of the -I flags. -GALLIUM_DRIVER_CFLAGS = \ - -I$(srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) - -GALLIUM_DRIVER_CXXFLAGS = \ - -I$(srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - $(DEFINES) \ - $(VISIBILITY_CXXFLAGS) - -GALLIUM_TARGET_CFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/loader \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_builddir)/src/util/ \ - -I$(top_builddir)/src/gallium/drivers/ \ - $(DEFINES) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -GALLIUM_COMMON_LIB_DEPS = \ - -lm \ - $(LIBUNWIND_LIBS) \ - $(LIBSENSORS_LIBS) \ - $(CLOCK_LIB) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -if HAVE_LIBDRM -GALLIUM_COMMON_LIB_DEPS += \ - $(LIBDRM_LIBS) -endif - -if HAVE_PLATFORM_ANDROID -GALLIUM_COMMON_LIB_DEPS += \ - $(ANDROID_LIBS) \ - $(BACKTRACE_LIBS) -endif - -GALLIUM_WINSYS_CFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) - - -GALLIUM_PIPE_LOADER_WINSYS_LIBS = \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ - $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la - -if HAVE_DRISW -GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ - $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la -endif - -if HAVE_DRISW_KMS -GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ - $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la \ - $(LIBDRM_LIBS) -endif diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am deleted file mode 100644 index ff69796180f..00000000000 --- a/src/gallium/Makefile.am +++ /dev/null @@ -1,207 +0,0 @@ -SUBDIRS = - -## -## Gallium auxiliary module -## - -SUBDIRS += auxiliary -SUBDIRS += auxiliary/pipe-loader - -## -## Gallium pipe drivers and their respective winsys' -## - -## freedreno/msm/kgsl -if HAVE_GALLIUM_FREEDRENO -SUBDIRS += drivers/freedreno winsys/freedreno/drm -endif - -## i915g/i915 -if HAVE_GALLIUM_I915 -SUBDIRS += drivers/i915 winsys/i915/drm -endif - -## nouveau -if HAVE_GALLIUM_NOUVEAU -SUBDIRS += drivers/nouveau winsys/nouveau/drm -endif - -## vmwgfx/svga -if HAVE_GALLIUM_SVGA -SUBDIRS += drivers/svga winsys/svga/drm -endif - -## r300 -if HAVE_GALLIUM_R300 -SUBDIRS += drivers/r300 -endif - -## r600 -if HAVE_GALLIUM_R600 -SUBDIRS += drivers/r600 -endif - -## radeonsi -if HAVE_GALLIUM_RADEONSI -SUBDIRS += drivers/radeonsi -SUBDIRS += winsys/amdgpu/drm -endif - -## the radeon winsys - linked in by r300, r600 and radeonsi -if NEED_RADEON_DRM_WINSYS -SUBDIRS += winsys/radeon/drm -endif - -if HAVE_GALLIUM_ETNAVIV -SUBDIRS += drivers/etnaviv winsys/etnaviv/drm -endif - -if HAVE_GALLIUM_KMSRO -SUBDIRS += drivers/kmsro winsys/kmsro/drm -endif - -## swrast/softpipe -if HAVE_GALLIUM_SOFTPIPE -SUBDIRS += drivers/softpipe - -## swrast/llvmpipe -if HAVE_GALLIUM_LLVMPIPE -SUBDIRS += drivers/llvmpipe -endif -endif - -if HAVE_GALLIUM_SWR -SUBDIRS += drivers/swr -endif - -## tegra -if HAVE_GALLIUM_TEGRA -SUBDIRS += drivers/tegra winsys/tegra/drm -endif - -## vc4/rpi -if HAVE_GALLIUM_VC4 -SUBDIRS += drivers/vc4 winsys/vc4/drm -endif - -## v3d -if HAVE_GALLIUM_V3D -SUBDIRS += drivers/v3d winsys/v3d/drm -endif - -## virgl -if HAVE_GALLIUM_VIRGL -SUBDIRS += drivers/virgl winsys/virgl/drm winsys/virgl/vtest -endif - -## the sw winsys' -SUBDIRS += winsys/sw/null - -if NEED_WINSYS_XLIB -SUBDIRS += winsys/sw/xlib -endif - -if HAVE_DRISW -SUBDIRS += winsys/sw/dri -endif - -if HAVE_DRISW_KMS -SUBDIRS += winsys/sw/kms-dri -endif - -SUBDIRS += winsys/sw/wrapper - -## -## Don't forget to bundle the remaining (non autotools) winsys' -## - -EXTRA_DIST = \ - docs \ - README.portability \ - SConscript \ - winsys/sw/gdi \ - winsys/sw/hgl - - -## -## Gallium state trackers and their users (targets) -## - -## XXX: Rename the conditional once we have a config switch for static/dynamic pipe-drivers -if HAVE_CLOVER -SUBDIRS += targets/pipe-loader -endif - -if HAVE_CLOVER -SUBDIRS += state_trackers/clover targets/opencl -endif - -if HAVE_DRICOMMON -SUBDIRS += state_trackers/dri targets/dri -endif - -if HAVE_GALLIUM_XLIB_GLX -SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib -endif - -if HAVE_ST_OMX_BELLAGIO -SUBDIRS += state_trackers/omx targets/omx -endif - -if HAVE_ST_OMX_TIZONIA -SUBDIRS += state_trackers/omx targets/omx -endif - -if HAVE_GALLIUM_OSMESA -SUBDIRS += state_trackers/osmesa targets/osmesa -endif - -if HAVE_ST_VA -SUBDIRS += state_trackers/va targets/va -endif - -if HAVE_ST_VDPAU -SUBDIRS += state_trackers/vdpau targets/vdpau -endif - -if HAVE_ST_XA -SUBDIRS += state_trackers/xa targets/xa -endif - -if HAVE_ST_XVMC -SUBDIRS += state_trackers/xvmc targets/xvmc -endif - -if HAVE_ST_NINE -SUBDIRS += state_trackers/nine targets/d3dadapter9 -endif - -## -## Don't forget to bundle the remaining (non autotools) state-trackers/targets -## - -EXTRA_DIST += \ - include \ - state_trackers/README \ - state_trackers/wgl targets/libgl-gdi \ - targets/graw-gdi targets/graw-null targets/graw-xlib \ - state_trackers/hgl targets/haiku-softpipe \ - tools - - -## -## Gallium tests -## - -if HAVE_GALLIUM_TESTS -SUBDIRS += \ - tests/trivial \ - tests/unit -endif - -EXTRA_DIST += \ - tests/graw \ - tests/python \ - meson.build \ - tests/meson.build \ - tests/graw/meson.build diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am deleted file mode 100644 index d7d803a961c..00000000000 --- a/src/gallium/auxiliary/Makefile.am +++ /dev/null @@ -1,134 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -noinst_LTLIBRARIES = libgallium.la - -AM_CFLAGS = \ - -I$(top_srcdir)/src/loader \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/gallium/auxiliary/util \ - $(GALLIUM_CFLAGS) \ - $(LIBUNWIND_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) - -AM_CXXFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CXXFLAGS) \ - $(MSVC2013_COMPAT_CXXFLAGS) - -libgallium_la_SOURCES = \ - $(C_SOURCES) \ - $(NIR_SOURCES) \ - $(GENERATED_SOURCES) - -if HAVE_PLATFORM_ANDROID -# Android's libbacktrace headers required C++11, but the Android toolchain (at -# least in the Chrome OS SDK) does not enable C++11 by default. -AM_CXXFLAGS += $(CXX11_CXXFLAGS) - -libgallium_la_SOURCES += util/u_debug_stack_android.cpp -endif - -if HAVE_LIBDRM - -AM_CFLAGS += \ - $(LIBDRM_CFLAGS) - -libgallium_la_SOURCES += \ - $(RENDERONLY_SOURCES) - -endif - -if HAVE_GALLIUM_LLVM - -AM_CFLAGS += \ - $(LLVM_CFLAGS) - -AM_CXXFLAGS += \ - $(LLVM_CXXFLAGS) - -libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) - -endif - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -indices/u_indices_gen.c: indices/u_indices_gen.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/indices/u_indices_gen.py > $@ - -indices/u_unfilled_gen.c: indices/u_unfilled_gen.py - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/indices/u_unfilled_gen.py > $@ - -util/u_format_table.c: util/u_format_table.py \ - util/u_format_pack.py \ - util/u_format_parse.py \ - util/u_format.csv - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ - -noinst_LTLIBRARIES += libgalliumvl_stub.la -libgalliumvl_stub_la_SOURCES = \ - $(VL_STUB_SOURCES) - -if NEED_GALLIUM_VL - -COMMON_VL_CFLAGS = \ - $(AM_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(DRI2PROTO_CFLAGS) \ - $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES += libgalliumvl.la - -libgalliumvl_la_CFLAGS = \ - $(COMMON_VL_CFLAGS) - -libgalliumvl_la_SOURCES = \ - $(VL_SOURCES) - -if NEED_GALLIUM_VL_WINSYS - -noinst_LTLIBRARIES += libgalliumvlwinsys.la - -libgalliumvlwinsys_la_CFLAGS = $(COMMON_VL_CFLAGS) -libgalliumvlwinsys_la_SOURCES = $(VL_WINSYS_SOURCES) - -if HAVE_PLATFORM_X11 -libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI2_SOURCES) - -if HAVE_DRI3 -libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRI3_SOURCES) -endif -endif - -if HAVE_PLATFORM_DRM -libgalliumvlwinsys_la_SOURCES += $(VL_WINSYS_DRM_SOURCES) -endif - -endif # NEED_GALLIUM_VL_WINSYS -endif # NEED_GALLIUM_VL - -EXTRA_DIST = \ - SConscript \ - driver_rbug/README \ - driver_trace/README \ - driver_trace/trace.xsl \ - indices/u_indices.c \ - indices/u_unfilled_indices.c \ - indices/u_indices_gen.py \ - indices/u_unfilled_gen.py \ - postprocess/ADDING \ - rbug/README \ - target-helpers \ - util/u_debug_stack_android.cpp \ - util/u_format.csv \ - util/u_format_pack.py \ - util/u_format_parse.py \ - util/u_format_table.py \ - meson.build diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am deleted file mode 100644 index 718e5afad63..00000000000 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -# XXX: check if we need the gallium/winsys include -AM_CFLAGS = \ - -I$(top_srcdir)/src/loader \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_builddir)/src/util \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -noinst_LTLIBRARIES = \ - libpipe_loader_static.la \ - libpipe_loader_dynamic.la - -libpipe_loader_static_la_CFLAGS = \ - $(AM_CFLAGS) \ - -DGALLIUM_STATIC_TARGETS=1 - -libpipe_loader_dynamic_la_CFLAGS = \ - $(AM_CFLAGS) \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" - -libpipe_loader_static_la_SOURCES = \ - $(COMMON_SOURCES) - -libpipe_loader_dynamic_la_SOURCES = \ - $(COMMON_SOURCES) - -if HAVE_LIBDRM -AM_CFLAGS += \ - $(LIBDRM_CFLAGS) - -libpipe_loader_static_la_SOURCES += \ - $(DRM_SOURCES) - -libpipe_loader_dynamic_la_SOURCES += \ - $(DRM_SOURCES) - -endif - -libpipe_loader_static_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libxmlconfig.la - -libpipe_loader_dynamic_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libxmlconfig.la - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/drivers/etnaviv/Automake.inc b/src/gallium/drivers/etnaviv/Automake.inc deleted file mode 100644 index f9b39567e36..00000000000 --- a/src/gallium/drivers/etnaviv/Automake.inc +++ /dev/null @@ -1,11 +0,0 @@ -if HAVE_GALLIUM_ETNAVIV - -TARGET_DRIVERS += etnaviv -TARGET_CPPFLAGS += -DGALLIUM_ETNAVIV -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/etnaviv/drm/libetnavivdrm.la \ - $(top_builddir)/src/gallium/drivers/etnaviv/libetnaviv.la \ - $(ETNAVIV_LIBS) \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/etnaviv/Makefile.am b/src/gallium/drivers/etnaviv/Makefile.am deleted file mode 100644 index 81ef3c9f370..00000000000 --- a/src/gallium/drivers/etnaviv/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright © 2013 W.J. van der Laan -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -noinst_LTLIBRARIES = libetnaviv.la - -AM_CPPFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(ETNAVIV_CFLAGS) - -libetnaviv_la_SOURCES = $(C_SOURCES) - -noinst_PROGRAMS = etnaviv_compiler - -etnaviv_compiler_SOURCES = \ - etnaviv_compiler_cmdline.c - -etnaviv_compiler_LDADD = \ - libetnaviv.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) \ - $(ETNAVIV_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/gallium/drivers/freedreno/Automake.inc b/src/gallium/drivers/freedreno/Automake.inc deleted file mode 100644 index 936c286f4c9..00000000000 --- a/src/gallium/drivers/freedreno/Automake.inc +++ /dev/null @@ -1,13 +0,0 @@ -if HAVE_GALLIUM_FREEDRENO - -TARGET_DRIVERS += msm kgsl -TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(top_builddir)/src/freedreno/libfreedreno_drm.la \ - $(top_builddir)/src/freedreno/libfreedreno_ir3.la \ - $(FREEDRENO_LIBS) \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am deleted file mode 100644 index c002378dfb1..00000000000 --- a/src/gallium/drivers/freedreno/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -Wno-packed-bitfield-compat \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \ - -I$(top_srcdir)/src/freedreno \ - -I$(top_srcdir)/src/freedreno/registers \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - $(LIBDRM_CFLAGS) \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = libfreedreno.la - -libfreedreno_la_SOURCES = \ - $(C_SOURCES) \ - $(a2xx_SOURCES) \ - $(a3xx_SOURCES) \ - $(a4xx_SOURCES) \ - $(a5xx_SOURCES) \ - $(a6xx_SOURCES) \ - $(ir3_SOURCES) - -EXTRA_DIST = \ - ir3/ir3_cmdline.c \ - meson.build diff --git a/src/gallium/drivers/i915/Automake.inc b/src/gallium/drivers/i915/Automake.inc deleted file mode 100644 index 73ef8101d1c..00000000000 --- a/src/gallium/drivers/i915/Automake.inc +++ /dev/null @@ -1,11 +0,0 @@ -if HAVE_GALLIUM_I915 - -TARGET_DRIVERS += i915 -TARGET_CPPFLAGS += -DGALLIUM_I915 -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(I915_LIBS) \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am deleted file mode 100644 index 261f292fd21..00000000000 --- a/src/gallium/drivers/i915/Makefile.am +++ /dev/null @@ -1,33 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = libi915.la - -libi915_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = TODO meson.build diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc deleted file mode 100644 index 61989f425ac..00000000000 --- a/src/gallium/drivers/kmsro/Automake.inc +++ /dev/null @@ -1,16 +0,0 @@ -if HAVE_GALLIUM_KMSRO - -TARGET_DRIVERS += hx8357d -TARGET_DRIVERS += ili9225 -TARGET_DRIVERS += ili9341 -TARGET_DRIVERS += mi0283qt -TARGET_DRIVERS += pl111 -TARGET_DRIVERS += repaper -TARGET_DRIVERS += st7586 -TARGET_DRIVERS += st7735r -TARGET_CPPFLAGS += -DGALLIUM_KMSRO -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/kmsro/Makefile.am b/src/gallium/drivers/kmsro/Makefile.am deleted file mode 100644 index 5bfaccaa1e5..00000000000 --- a/src/gallium/drivers/kmsro/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - $(GALLIUM_CFLAGS) - -noinst_LTLIBRARIES = libkmsro.la - -libkmsro_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/llvmpipe/Automake.inc b/src/gallium/drivers/llvmpipe/Automake.inc deleted file mode 100644 index 0a0aa34e74a..00000000000 --- a/src/gallium/drivers/llvmpipe/Automake.inc +++ /dev/null @@ -1,7 +0,0 @@ -if HAVE_GALLIUM_LLVMPIPE - -TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la - -endif diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am deleted file mode 100644 index d649fa44b95..00000000000 --- a/src/gallium/drivers/llvmpipe/Makefile.am +++ /dev/null @@ -1,80 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(LLVM_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) -AM_CXXFLAGS= \ - $(GALLIUM_DRIVER_CXXFLAGS) \ - $(LLVM_CXXFLAGS) \ - $(MSVC2013_COMPAT_CXXFLAGS) - -noinst_LTLIBRARIES = libllvmpipe.la - -libllvmpipe_la_SOURCES = $(C_SOURCES) - -libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS) - -noinst_HEADERS = lp_test.h - -check_PROGRAMS = \ - lp_test_format \ - lp_test_arit \ - lp_test_blend \ - lp_test_conv \ - lp_test_printf -TESTS = $(check_PROGRAMS) - -TEST_LIBS = \ - libllvmpipe.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LLVM_LIBS) \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) - -lp_test_format_SOURCES = lp_test_format.c lp_test_main.c -lp_test_format_LDADD = $(TEST_LIBS) -nodist_EXTRA_lp_test_format_SOURCES = dummy.cpp - -lp_test_arit_SOURCES = lp_test_arit.c lp_test_main.c -lp_test_arit_LDADD = $(TEST_LIBS) -nodist_EXTRA_lp_test_arit_SOURCES = dummy.cpp - -lp_test_blend_SOURCES = lp_test_blend.c lp_test_main.c -lp_test_blend_LDADD = $(TEST_LIBS) -nodist_EXTRA_lp_test_blend_SOURCES = dummy.cpp - -lp_test_conv_SOURCES = lp_test_conv.c lp_test_main.c -lp_test_conv_LDADD = $(TEST_LIBS) -nodist_EXTRA_lp_test_conv_SOURCES = dummy.cpp - -lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c -lp_test_printf_LDADD = $(TEST_LIBS) -nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/drivers/nouveau/Automake.inc b/src/gallium/drivers/nouveau/Automake.inc deleted file mode 100644 index 657790494dc..00000000000 --- a/src/gallium/drivers/nouveau/Automake.inc +++ /dev/null @@ -1,14 +0,0 @@ -if HAVE_GALLIUM_NOUVEAU - -TARGET_DRIVERS += nouveau -TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ - $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ - $(NOUVEAU_LIBS) \ - $(LIBDRM_LIBS) - -TARGET_COMPILER_LIB_DEPS = \ - $(top_builddir)/src/compiler/nir/libnir.la - -endif diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am deleted file mode 100644 index ee7191675cc..00000000000 --- a/src/gallium/drivers/nouveau/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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(NOUVEAU_CFLAGS) - -noinst_LTLIBRARIES = libnouveau.la - -libnouveau_la_SOURCES = \ - $(C_SOURCES) \ - $(NV30_C_SOURCES) \ - $(NV50_CODEGEN_SOURCES) \ - $(NV50_C_SOURCES) \ - $(NVC0_CODEGEN_SOURCES) \ - $(NVC0_C_SOURCES) - -noinst_PROGRAMS = nouveau_compiler - -nodist_EXTRA_nouveau_compiler_SOURCES = dummy.cpp -nouveau_compiler_SOURCES = \ - nouveau_compiler.c - -nouveau_compiler_LDADD = \ - libnouveau.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) - -EXTRA_DIST = codegen/lib nvc0/mme meson.build diff --git a/src/gallium/drivers/r300/Automake.inc b/src/gallium/drivers/r300/Automake.inc deleted file mode 100644 index d4ddc401bb3..00000000000 --- a/src/gallium/drivers/r300/Automake.inc +++ /dev/null @@ -1,13 +0,0 @@ -if HAVE_GALLIUM_R300 - -TARGET_DRIVERS += r300 -TARGET_CPPFLAGS += -DGALLIUM_R300 -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(RADEON_LIBS) \ - $(LIBDRM_LIBS) - -TARGET_RADEON_WINSYS = \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la - -endif diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am deleted file mode 100644 index 26c75be3271..00000000000 --- a/src/gallium/drivers/r300/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mesa/program \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/glsl \ - -I$(top_srcdir)/src/mapi \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(LLVM_CFLAGS) \ - $(RADEON_CFLAGS) - -noinst_LTLIBRARIES = libr300.la -check_PROGRAMS = r300_compiler_tests -TESTS = r300_compiler_tests - -r300_compiler_tests_LDADD = libr300.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) -r300_compiler_tests_CPPFLAGS = \ - -DTEST_PATH=\"$(top_srcdir)/src/gallium/drivers/r300/compiler/tests\" \ - -I$(top_srcdir)/src/gallium/drivers/r300/compiler -r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES) - -libr300_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = \ - compiler/tests/omod_two_writers.test \ - compiler/tests/regalloc_tex_1d_swizzle.test \ - meson.build diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc deleted file mode 100644 index 727b1174d3f..00000000000 --- a/src/gallium/drivers/r600/Automake.inc +++ /dev/null @@ -1,14 +0,0 @@ -if HAVE_GALLIUM_R600 - -TARGET_DRIVERS += r600 -TARGET_CPPFLAGS += -DGALLIUM_R600 -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(RADEON_LIBS) \ - $(LIBDRM_LIBS) \ - $(LIBELF_LIBS) - -TARGET_RADEON_WINSYS = \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la - -endif diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am deleted file mode 100644 index c5b41cce26e..00000000000 --- a/src/gallium/drivers/r600/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -egd_tables.h: $(srcdir)/egd_tables.py $(srcdir)/evergreend.h - $(AM_V_at)$(MKDIR_P) $(@D) - $(AM_V_GEN) $(PYTHON) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h > $@ - -BUILT_SOURCES = $(R600_GENERATED_FILES) -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(RADEON_CFLAGS) \ - $(LIBELF_CFLAGS) \ - -I$(top_srcdir)/src/amd/common -Wstrict-overflow=0 - -AM_CXXFLAGS = \ - $(GALLIUM_DRIVER_CXXFLAGS) \ - $(RADEON_CFLAGS) \ - $(LIBELF_CFLAGS) \ - -I$(top_srcdir)/src/amd/common - -noinst_LTLIBRARIES = libr600.la - -libr600_la_SOURCES = \ - $(C_SOURCES) \ - $(CXX_SOURCES) - -if HAVE_GALLIUM_LLVM - -AM_CFLAGS += \ - $(LLVM_CFLAGS) - -endif - -if HAVE_GALLIUM_COMPUTE -AM_CFLAGS += \ - -DHAVE_OPENCL -endif - -CLEANFILES = \ - egd_tables.h - -EXTRA_DIST = \ - egd_tables.py \ - sb/notes.markdown \ - sb/sb_bc_fmt_def.inc \ - meson.build diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc deleted file mode 100644 index 740648d798b..00000000000 --- a/src/gallium/drivers/radeonsi/Automake.inc +++ /dev/null @@ -1,21 +0,0 @@ -if HAVE_GALLIUM_RADEONSI - -TARGET_DRIVERS += radeonsi -TARGET_CPPFLAGS += -DGALLIUM_RADEONSI -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(RADEON_LIBS) \ - $(LIBDRM_LIBS) \ - $(AMDGPU_LIBS) - -TARGET_COMPILER_LIB_DEPS = \ - $(top_builddir)/src/compiler/nir/libnir.la - -TARGET_RADEON_WINSYS = \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la - -TARGET_RADEON_COMMON = \ - $(top_builddir)/src/amd/common/libamd_common.la - -endif diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am deleted file mode 100644 index 317ae7ea19f..00000000000 --- a/src/gallium/drivers/radeonsi/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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - -I$(top_builddir)/src/amd/common \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/amd/common \ - $(RADEON_CFLAGS) \ - $(LLVM_CFLAGS) \ - -Wstrict-overflow=0 -# ^^ disable warnings about overflows (os_time_timeout) - -noinst_LTLIBRARIES = libradeonsi.la - -libradeonsi_la_SOURCES = $(C_SOURCES) - -libradeonsi_la_LIBADD = \ - $(CLOCK_LIB) \ - $(LLVM_LIBS) - -libradeonsi_la_LDFLAGS = \ - $(LLVM_LDFLAGS) - -GEN_DRIINFO_INPUTS = \ - $(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \ - $(srcdir)/driinfo_radeonsi.h - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) -MERGE_DRIINFO = $(top_srcdir)/src/util/merge_driinfo.py - -si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) - $(PYTHON_GEN) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) > $@ || ($(RM) $@; false) - -BUILT_SOURCES = $(GENERATED_SOURCES) -CLEANFILES = $(GENERATED_SOURCES) -EXTRA_DIST = meson.build diff --git a/src/gallium/drivers/softpipe/Automake.inc b/src/gallium/drivers/softpipe/Automake.inc deleted file mode 100644 index bd3c2eead16..00000000000 --- a/src/gallium/drivers/softpipe/Automake.inc +++ /dev/null @@ -1,12 +0,0 @@ -if HAVE_GALLIUM_SOFTPIPE - -TARGET_DRIVERS += swrast -TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la - -if HAVE_DRISW_KMS -TARGET_DRIVERS += kms_swrast - -endif -endif diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am deleted file mode 100644 index c8c2615a970..00000000000 --- a/src/gallium/drivers/softpipe/Makefile.am +++ /dev/null @@ -1,34 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) - -noinst_LTLIBRARIES = libsoftpipe.la - -libsoftpipe_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/drivers/svga/Automake.inc b/src/gallium/drivers/svga/Automake.inc deleted file mode 100644 index d2d1d8f1842..00000000000 --- a/src/gallium/drivers/svga/Automake.inc +++ /dev/null @@ -1,10 +0,0 @@ -if HAVE_GALLIUM_SVGA - -TARGET_DRIVERS += vmwgfx -TARGET_CPPFLAGS += -DGALLIUM_VMWGFX -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ - $(top_builddir)/src/gallium/drivers/svga/libsvga.la \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am deleted file mode 100644 index a457df03c8c..00000000000 --- a/src/gallium/drivers/svga/Makefile.am +++ /dev/null @@ -1,41 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - -I$(top_builddir)/src - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) - -noinst_HEADERS = $(SVGA_H_FILES) -noinst_LTLIBRARIES = libsvga.la - -libsvga_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript \ - include/README \ - svgadump/svga_dump.py \ - meson.build diff --git a/src/gallium/drivers/swr/Automake.inc b/src/gallium/drivers/swr/Automake.inc deleted file mode 100644 index a51921455a9..00000000000 --- a/src/gallium/drivers/swr/Automake.inc +++ /dev/null @@ -1,8 +0,0 @@ -if HAVE_GALLIUM_SWR - -TARGET_DRIVERS += swrast -TARGET_CPPFLAGS += -DGALLIUM_SWR -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la - -endif diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am deleted file mode 100644 index 3390ef6b096..00000000000 --- a/src/gallium/drivers/swr/Makefile.am +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright (C) 2015 Intel Corporation. All Rights Reserved. -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(CXX11_CXXFLAGS) - -noinst_LTLIBRARIES = libmesaswr.la - -libmesaswr_la_SOURCES = \ - $(CXX_SOURCES) \ - $(JITTER_CXX_SOURCES) \ - $(LOADER_SOURCES) - -COMMON_CXXFLAGS = \ - -fno-strict-aliasing \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(LLVM_CXXFLAGS) \ - $(CXX11_CXXFLAGS) \ - -I$(builddir)/rasterizer/codegen \ - -I$(builddir)/rasterizer/core \ - -I$(builddir)/rasterizer/jitter \ - -I$(builddir)/rasterizer/archrast \ - -I$(srcdir)/rasterizer \ - -I$(srcdir)/rasterizer/core \ - -I$(srcdir)/rasterizer/codegen \ - -I$(srcdir)/rasterizer/jitter \ - -I$(srcdir)/rasterizer/archrast - -# SWR_AVX_CXXFLAGS needed for intrinsic usage in swr api headers -libmesaswr_la_CXXFLAGS = \ - $(SWR_AVX_CXXFLAGS) \ - $(COMMON_CXXFLAGS) - -if HAVE_SWR_AVX -libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX -endif - -if HAVE_SWR_AVX2 -libmesaswr_la_CXXFLAGS += -DHAVE_SWR_AVX2 -endif - -if HAVE_SWR_KNL -libmesaswr_la_CXXFLAGS += -DHAVE_SWR_KNL -endif - -if HAVE_SWR_SKX -libmesaswr_la_CXXFLAGS += -DHAVE_SWR_SKX -endif - -COMMON_SOURCES = \ - $(ARCHRAST_CXX_SOURCES) \ - $(COMMON_CXX_SOURCES) \ - $(CORE_CXX_SOURCES) \ - $(MEMORY_CXX_SOURCES) \ - $(BUILT_SOURCES) - -BUILT_SOURCES = \ - gen_swr_context_llvm.h \ - rasterizer/codegen/gen_knobs.cpp \ - rasterizer/codegen/gen_knobs.h \ - rasterizer/jitter/gen_state_llvm.h \ - rasterizer/jitter/gen_builder.hpp \ - rasterizer/jitter/gen_builder_meta.hpp \ - rasterizer/jitter/gen_builder_intrin.hpp \ - rasterizer/archrast/gen_ar_event.hpp \ - rasterizer/archrast/gen_ar_event.cpp \ - rasterizer/archrast/gen_ar_eventhandler.hpp \ - rasterizer/archrast/gen_ar_eventhandlerfile.hpp \ - rasterizer/core/backends/gen_BackendPixelRate0.cpp \ - rasterizer/core/backends/gen_BackendPixelRate1.cpp \ - rasterizer/core/backends/gen_BackendPixelRate2.cpp \ - rasterizer/core/backends/gen_BackendPixelRate3.cpp \ - rasterizer/core/backends/gen_BackendPixelRate.hpp \ - rasterizer/core/backends/gen_rasterizer0.cpp \ - rasterizer/core/backends/gen_rasterizer1.cpp \ - rasterizer/core/backends/gen_rasterizer2.cpp \ - rasterizer/core/backends/gen_rasterizer3.cpp \ - rasterizer/core/backends/gen_rasterizer.hpp - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) -gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp swr_context.h - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_llvm_types.py \ - --input $(srcdir)/swr_context.h \ - --output ./gen_swr_context_llvm.h - $(AM_V_GEN)touch $@ - -rasterizer/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.cpp rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_knobs.py \ - --output rasterizer/codegen/gen_knobs.cpp \ - --gen_cpp - $(AM_V_GEN)touch $@ - -rasterizer/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/gen_knobs.h rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_knobs.py \ - --output rasterizer/codegen/gen_knobs.h \ - --gen_h - $(AM_V_GEN)touch $@ - -rasterizer/jitter/gen_state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp rasterizer/core/state.h rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_llvm_types.py \ - --input $(srcdir)/rasterizer/core/state.h \ - --output rasterizer/jitter/gen_state_llvm.h - $(AM_V_GEN)touch $@ - -rasterizer/jitter/gen_builder.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ - --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \ - --output rasterizer/jitter \ - --gen_h - $(AM_V_GEN)touch $@ - -rasterizer/jitter/gen_builder_meta.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ - --output rasterizer/jitter \ - --gen_meta_h - $(AM_V_GEN)touch $@ - -rasterizer/jitter/gen_builder_intrin.hpp: rasterizer/codegen/gen_llvm_ir_macros.py rasterizer/codegen/templates/gen_builder.hpp rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ - --output rasterizer/jitter \ - --gen_intrin_h - $(AM_V_GEN)touch $@ - -rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_archrast.py \ - --proto $(srcdir)/rasterizer/archrast/events.proto \ - --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ - --output rasterizer/archrast/gen_ar_event.hpp \ - --gen_event_hpp - $(AM_V_GEN)touch $@ - -rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_archrast.py \ - --proto $(srcdir)/rasterizer/archrast/events.proto \ - --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ - --output rasterizer/archrast/gen_ar_event.cpp \ - --gen_event_cpp - $(AM_V_GEN)touch $@ - -rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_archrast.py \ - --proto $(srcdir)/rasterizer/archrast/events.proto \ - --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ - --output rasterizer/archrast/gen_ar_eventhandler.hpp \ - --gen_eventhandler_hpp - $(AM_V_GEN)touch $@ - -rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_archrast.py \ - --proto $(srcdir)/rasterizer/archrast/events.proto \ - --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ - --output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \ - --gen_eventhandlerfile_hpp - $(AM_V_GEN)touch $@ - -rasterizer/core/backends/gen_BackendPixelRate0.cpp \ -rasterizer/core/backends/gen_BackendPixelRate1.cpp \ -rasterizer/core/backends/gen_BackendPixelRate2.cpp \ -rasterizer/core/backends/gen_BackendPixelRate3.cpp \ -rasterizer/core/backends/gen_BackendPixelRate.hpp: \ -backend.intermediate - -# 5 SWR_MULTISAMPLE_TYPE_COUNT -# 2 SWR_MSAA_SAMPLE_PATTERN_COUNT -# 3 SWR_INPUT_COVERAGE_COUNT -# 2 centroid -# 2 forcedSampleCount -# 2 canEarlyZ - -# use intermediate rule to tell make that all files can be -# generated in one invocation of gen_backends.py (prevents -# parallel make race condition) -.INTERMEDIATE: backend.intermediate -backend.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_backend.cpp rasterizer/codegen/templates/gen_header_init.hpp - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_backends.py \ - --outdir rasterizer/core/backends \ - --dim 5 2 3 2 2 2 \ - --numfiles 4 \ - --cpp \ - --hpp - -rasterizer/core/backends/gen_rasterizer0.cpp \ -rasterizer/core/backends/gen_rasterizer1.cpp \ -rasterizer/core/backends/gen_rasterizer2.cpp \ -rasterizer/core/backends/gen_rasterizer3.cpp \ -rasterizer/core/backends/gen_rasterizer.hpp: \ -rasterizer.intermediate - -# 5 SWR_MULTISAMPLE_TYPE_COUNT -# 2 CenterPattern -# 2 Conservative -# 3 SWR_INPUT_COVERAGE_COUNT -# 5 STATE_VALID_TRI_EDGE_COUNT -# 2 RasterScissorEdges - -# use intermediate rule to tell make that all files can be -# generated in one invocation of gen_backends.py (prevents -# parallel make race condition) -.INTERMEDIATE: rasterizer.intermediate -rasterizer.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/gen_rasterizer.cpp rasterizer/codegen/templates/gen_header_init.hpp - $(MKDIR_GEN) - $(PYTHON_GEN) \ - $(srcdir)/rasterizer/codegen/gen_backends.py \ - --outdir rasterizer/core/backends \ - --rast \ - --dim 5 2 2 3 5 2 \ - --numfiles 4 \ - --cpp \ - --hpp - -COMMON_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -lib_LTLIBRARIES = - -if HAVE_SWR_AVX -libswrAVX_la_CXXFLAGS = \ - $(PTHREAD_CFLAGS) \ - $(SWR_AVX_CXXFLAGS) \ - -DKNOB_ARCH=KNOB_ARCH_AVX \ - $(COMMON_CXXFLAGS) - -libswrAVX_la_SOURCES = \ - $(COMMON_SOURCES) - -libswrAVX_la_LIBADD = \ - $(PTHREAD_LIBS) - -libswrAVX_la_LDFLAGS = \ - $(COMMON_LDFLAGS) -endif - -if HAVE_SWR_AVX2 -libswrAVX2_la_CXXFLAGS = \ - $(PTHREAD_CFLAGS) \ - $(SWR_AVX2_CXXFLAGS) \ - -DKNOB_ARCH=KNOB_ARCH_AVX2 \ - $(COMMON_CXXFLAGS) - -libswrAVX2_la_SOURCES = \ - $(COMMON_SOURCES) - -libswrAVX2_la_LIBADD = \ - $(PTHREAD_LIBS) - -libswrAVX2_la_LDFLAGS = \ - $(COMMON_LDFLAGS) -endif - -if HAVE_SWR_KNL -libswrKNL_la_CXXFLAGS = \ - $(PTHREAD_CFLAGS) \ - $(SWR_KNL_CXXFLAGS) \ - -DKNOB_ARCH=KNOB_ARCH_AVX512 -DSIMD_ARCH_KNIGHTS \ - $(COMMON_CXXFLAGS) - -libswrKNL_la_SOURCES = \ - $(COMMON_SOURCES) - -libswrKNL_la_LIBADD = \ - $(PTHREAD_LIBS) - -libswrKNL_la_LDFLAGS = \ - $(COMMON_LDFLAGS) -endif - -if HAVE_SWR_SKX -libswrSKX_la_CXXFLAGS = \ - $(PTHREAD_CFLAGS) \ - $(SWR_SKX_CXXFLAGS) \ - -DKNOB_ARCH=KNOB_ARCH_AVX512 \ - $(COMMON_CXXFLAGS) - -libswrSKX_la_SOURCES = \ - $(COMMON_SOURCES) - -libswrSKX_la_LIBADD = \ - $(PTHREAD_LIBS) - -libswrSKX_la_LDFLAGS = \ - $(COMMON_LDFLAGS) -endif - -if HAVE_SWR_BUILTIN -libmesaswr_la_CXXFLAGS += -DHAVE_SWR_BUILTIN -libmesaswr_la_LIBADD = -if HAVE_SWR_AVX -noinst_LTLIBRARIES += libswrAVX.la -libmesaswr_la_LIBADD += libswrAVX.la -endif -if HAVE_SWR_AVX2 -noinst_LTLIBRARIES += libswrAVX2.la -libmesaswr_la_LIBADD += libswrAVX2.la -endif -if HAVE_SWR_KNL -noinst_LTLIBRARIES += libswrKNL.la -libmesaswr_la_LIBADD += libswrKNL.la -endif -if HAVE_SWR_SKX -noinst_LTLIBRARIES += libswrSKX.la -libmesaswr_la_LIBADD += libswrSKX.la -endif -else # !HAVE_SWR_BUILTIN -# gen_knobs.* included here to provide driver access to swr configuration -libmesaswr_la_SOURCES += \ - $(COMMON_CXX_SOURCES) \ - rasterizer/codegen/gen_knobs.cpp \ - rasterizer/codegen/gen_knobs.h -if HAVE_SWR_AVX -lib_LTLIBRARIES += libswrAVX.la -endif -if HAVE_SWR_AVX2 -lib_LTLIBRARIES += libswrAVX2.la -endif -if HAVE_SWR_KNL -lib_LTLIBRARIES += libswrKNL.la -endif -if HAVE_SWR_SKX -lib_LTLIBRARIES += libswrSKX.la -endif -endif - -include $(top_srcdir)/install-gallium-links.mk - -# Generated gen_builder.hpp is not backwards compatible. So ship only one -# created with the oldest supported version of LLVM. -dist-hook: -if SWR_INVALID_LLVM_VERSION - @echo "*****************************************" - @echo "LLVM 6.0.x required to create the tarball" - @echo "*****************************************" - @test -endif - -EXTRA_DIST = \ - SConscript \ - meson.build \ - rasterizer/jitter/meson.build \ - rasterizer/codegen/meson.build \ - rasterizer/core/backends/meson.build \ - rasterizer/archrast/events.proto \ - rasterizer/archrast/events_private.proto \ - rasterizer/codegen/gen_llvm_ir_macros.py \ - rasterizer/codegen/gen_llvm_types.py \ - rasterizer/codegen/gen_archrast.py \ - rasterizer/codegen/gen_backends.py \ - rasterizer/codegen/gen_common.py \ - rasterizer/codegen/gen_knobs.py \ - rasterizer/codegen/knob_defs.py \ - rasterizer/codegen/templates/gen_ar_event.cpp \ - rasterizer/codegen/templates/gen_ar_event.hpp \ - rasterizer/codegen/templates/gen_ar_eventhandler.hpp \ - rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp \ - rasterizer/codegen/templates/gen_backend.cpp \ - rasterizer/codegen/templates/gen_builder.hpp \ - rasterizer/codegen/templates/gen_header_init.hpp \ - rasterizer/codegen/templates/gen_knobs.cpp \ - rasterizer/codegen/templates/gen_knobs.h \ - rasterizer/codegen/templates/gen_llvm.hpp \ - rasterizer/codegen/templates/gen_rasterizer.cpp diff --git a/src/gallium/drivers/tegra/Automake.inc b/src/gallium/drivers/tegra/Automake.inc deleted file mode 100644 index f6528191624..00000000000 --- a/src/gallium/drivers/tegra/Automake.inc +++ /dev/null @@ -1,11 +0,0 @@ -if HAVE_GALLIUM_TEGRA - -TARGET_DRIVERS += tegra -TARGET_CPPFLAGS += -DGALLIUM_TEGRA -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/tegra/drm/libtegradrm.la \ - $(top_builddir)/src/gallium/drivers/tegra/libtegra.la \ - $(LIBDRM_LIBS) \ - $(TEGRA_LIBS) - -endif diff --git a/src/gallium/drivers/tegra/Makefile.am b/src/gallium/drivers/tegra/Makefile.am deleted file mode 100644 index bcb039b227f..00000000000 --- a/src/gallium/drivers/tegra/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - $(LIBDRM_CFLAGS) \ - $(GALLIUM_DRIVER_CFLAGS) - -noinst_LTLIBRARIES = libtegra.la - -libtegra_la_SOURCES = \ - $(C_SOURCES) - -EXTRA_DIST = \ - meson.build diff --git a/src/gallium/drivers/v3d/Automake.inc b/src/gallium/drivers/v3d/Automake.inc deleted file mode 100644 index 91ae826b301..00000000000 --- a/src/gallium/drivers/v3d/Automake.inc +++ /dev/null @@ -1,16 +0,0 @@ -if HAVE_GALLIUM_V3D - -TARGET_DRIVERS += v3d -TARGET_CPPFLAGS += -DGALLIUM_V3D -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/v3d/drm/libv3ddrm.la \ - $(top_builddir)/src/gallium/drivers/v3d/libv3d.la \ - $(top_builddir)/src/broadcom/libbroadcom.la \ - $(top_builddir)/src/broadcom/libbroadcom_v33.la \ - $(top_builddir)/src/broadcom/libbroadcom_v41.la - -if !HAVE_GALLIUM_VC4 -TARGET_LIB_DEPS += $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la -endif - -endif diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am deleted file mode 100644 index 5fb536275fd..00000000000 --- a/src/gallium/drivers/v3d/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright © 2014 Broadcom -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/broadcom \ - -I$(top_builddir)/src/broadcom \ - -I$(top_builddir)/src \ - $(LIBDRM_CFLAGS) \ - $(V3D_SIMULATOR_CFLAGS) \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - $() - -noinst_LTLIBRARIES = \ - libv3d.la \ - libv3d_v33.la \ - libv3d_v41.la \ - $() - -libv3d_v33_la_SOURCES = $(V3D_PER_VERSION_SOURCES) -libv3d_v33_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=33 - -libv3d_v41_la_SOURCES = $(V3D_PER_VERSION_SOURCES) -libv3d_v41_la_CFLAGS = $(AM_CFLAGS) -DV3D_VERSION=41 - -libv3d_la_SOURCES = $(C_SOURCES) - -libv3d_la_LDFLAGS = \ - $(V3D_SIMULATOR_LIBS) \ - $(NULL) -libv3d_la_LIBADD = \ - libv3d_v33.la \ - libv3d_v41.la \ - $() - -EXTRA_DIST = meson.build diff --git a/src/gallium/drivers/vc4/Automake.inc b/src/gallium/drivers/vc4/Automake.inc deleted file mode 100644 index 650466e495a..00000000000 --- a/src/gallium/drivers/vc4/Automake.inc +++ /dev/null @@ -1,19 +0,0 @@ -if HAVE_GALLIUM_VC4 - -TARGET_DRIVERS += vc4 -TARGET_CPPFLAGS += -DGALLIUM_VC4 - -if !HAVE_GALLIUM_V3D -TARGET_LIB_DEPS += \ - $(top_builddir)/src/broadcom/libbroadcom.la \ - $(top_builddir)/src/broadcom/libbroadcom_v33.la \ - $(top_builddir)/src/broadcom/libbroadcom_v41.la -endif - -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \ - $(top_builddir)/src/gallium/drivers/vc4/libvc4.la \ - $(top_builddir)/src/broadcom/cle/libbroadcom_cle.la - - -endif diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am deleted file mode 100644 index 585ff20e6cf..00000000000 --- a/src/gallium/drivers/vc4/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright © 2014 Broadcom -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -if USE_VC4_SIMULATOR -SIM_LDFLAGS = -lsimpenrose -endif - -AM_CFLAGS = \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src/broadcom \ - -I$(top_builddir)/src/broadcom \ - $(LIBDRM_CFLAGS) \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(SIM_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - $() - -noinst_LTLIBRARIES = libvc4.la - -libvc4_la_SOURCES = $(C_SOURCES) - -libvc4_la_LIBADD = \ - $(SIM_LIB) \ - $() - -if HAVE_ARM_ASM -noinst_LTLIBRARIES += libvc4_neon.la -libvc4_la_LIBADD += libvc4_neon.la -libvc4_neon_la_SOURCES = $(NEON_C_SOURCES) -libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -mfpu=neon -endif - -libvc4_la_LDFLAGS = $(SIM_LDFLAGS) - -EXTRA_DIST = kernel/README meson.build diff --git a/src/gallium/drivers/virgl/Automake.inc b/src/gallium/drivers/virgl/Automake.inc deleted file mode 100644 index b05d3e314c8..00000000000 --- a/src/gallium/drivers/virgl/Automake.inc +++ /dev/null @@ -1,11 +0,0 @@ -if HAVE_GALLIUM_VIRGL - -TARGET_DRIVERS += virtio_gpu -TARGET_CPPFLAGS += -DGALLIUM_VIRGL -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/virgl/libvirgl.la \ - $(top_builddir)/src/gallium/winsys/virgl/drm/libvirgldrm.la \ - $(top_builddir)/src/gallium/winsys/virgl/vtest/libvirglvtest.la \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/virgl/Makefile.am b/src/gallium/drivers/virgl/Makefile.am deleted file mode 100644 index e5e1d9ef6d9..00000000000 --- a/src/gallium/drivers/virgl/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright © 2014, 2015 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES = libvirgl.la - -libvirgl_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am deleted file mode 100644 index 32ed04f6a2c..00000000000 --- a/src/gallium/state_trackers/clover/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -include Makefile.sources - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/winsys - -if HAVE_CLOVER_ICD -AM_CPPFLAGS += -DHAVE_CLOVER_ICD -else -# Only install the headers if we are building a stand-alone implementation -cldir = $(includedir)/CL -cl_HEADERS = \ - $(top_srcdir)/include/CL/cl.h \ - $(top_srcdir)/include/CL/cl.hpp \ - $(top_srcdir)/include/CL/cl2.hpp \ - $(top_srcdir)/include/CL/cl_d3d10.h \ - $(top_srcdir)/include/CL/cl_d3d11.h \ - $(top_srcdir)/include/CL/cl_dx9_media_sharing.h \ - $(top_srcdir)/include/CL/cl_dx9_media_sharing_intel.h \ - $(top_srcdir)/include/CL/cl_egl.h \ - $(top_srcdir)/include/CL/cl_ext.h \ - $(top_srcdir)/include/CL/cl_ext_intel.h \ - $(top_srcdir)/include/CL/cl_gl.h \ - $(top_srcdir)/include/CL/cl_gl_ext.h \ - $(top_srcdir)/include/CL/cl_platform.h \ - $(top_srcdir)/include/CL/cl_va_api_media_sharing_intel.h \ - $(top_srcdir)/include/CL/cl_version.h \ - $(top_srcdir)/include/CL/opencl.h -endif - -noinst_LTLIBRARIES = libclover.la libclllvm.la - -libclllvm_la_CXXFLAGS = \ - $(CXX11_CXXFLAGS) \ - $(VISIBILITY_CXXFLAGS) \ - $(LLVM_CXXFLAGS) \ - $(CLOVER_STD_OVERRIDE) \ - $(DEFINES) \ - $(LIBELF_CFLAGS) \ - -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \ - -DLIBCLC_LIBEXECDIR=\"$(LIBCLC_LIBEXECDIR)/\" \ - -DCLANG_RESOURCE_DIR=\"$(CLANG_RESOURCE_DIR)\" - -libclllvm_la_SOURCES = $(LLVM_SOURCES) - -libclover_la_CXXFLAGS = \ - $(CXX11_CXXFLAGS) \ - $(CLOVER_STD_OVERRIDE) \ - $(VISIBILITY_CXXFLAGS) - -libclover_la_LIBADD = \ - libclllvm.la - -libclover_la_SOURCES = $(CPP_SOURCES) - -EXTRA_DIST = Doxyfile meson.build diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am deleted file mode 100644 index d66e585b195..00000000000 --- a/src/gallium/state_trackers/dri/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright © 2012 Intel Corporation -# Copyright © 2014 Emil Velikov -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - $(GALLIUM_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -if HAVE_GALLIUM_SOFTPIPE -AM_CPPFLAGS += \ - -DGALLIUM_SOFTPIPE -endif # HAVE_GALLIUM_SOFTPIPE - -noinst_LTLIBRARIES = libdri.la -libdri_la_SOURCES = $(common_SOURCES) - -if HAVE_DRISW -libdri_la_SOURCES += $(drisw_SOURCES) -endif - - -if HAVE_DRI2 -libdri_la_SOURCES += $(dri2_SOURCES) -endif - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am deleted file mode 100644 index 914d4a5b885..00000000000 --- a/src/gallium/state_trackers/glx/xlib/Makefile.am +++ /dev/null @@ -1,39 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(GLPROTO_CFLAGS) \ - $(X11_INCLUDES) -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa - -noinst_LTLIBRARIES = libxlib.la - -libxlib_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/state_trackers/nine/Makefile.am b/src/gallium/state_trackers/nine/Makefile.am deleted file mode 100644 index 2a66df8b9e6..00000000000 --- a/src/gallium/state_trackers/nine/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/include/D3D9 \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -noinst_LTLIBRARIES = libninetracker.la - -libninetracker_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = README meson.build diff --git a/src/gallium/state_trackers/omx/Makefile.am b/src/gallium/state_trackers/omx/Makefile.am deleted file mode 100644 index 734ca0908e4..00000000000 --- a/src/gallium/state_trackers/omx/Makefile.am +++ /dev/null @@ -1,53 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -if HAVE_ST_OMX_BELLAGIO -SUBDIRS = bellagio - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(OMX_BELLAGIO_CFLAGS) -else -SUBDIRS = tizonia - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(OMX_TIZONIA_CFLAGS) \ - $(OMX_TIZILHEADERS_CFLAGS) \ - $(OMX_TIZPLATFORM_CFLAGS) -endif - -noinst_LTLIBRARIES = libomxtracker_common.la - -libomxtracker_common_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/state_trackers/omx/bellagio/Makefile.am b/src/gallium/state_trackers/omx/bellagio/Makefile.am deleted file mode 100644 index 3e542ab0f26..00000000000 --- a/src/gallium/state_trackers/omx/bellagio/Makefile.am +++ /dev/null @@ -1,36 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/state_trackers/omx \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(OMX_BELLAGIO_CFLAGS) - -noinst_LTLIBRARIES = libomxtracker.la - -libomxtracker_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.am b/src/gallium/state_trackers/omx/tizonia/Makefile.am deleted file mode 100644 index ac72affa326..00000000000 --- a/src/gallium/state_trackers/omx/tizonia/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/egl \ - -I$(top_srcdir)/src/egl/drivers/dri2 \ - -I$(top_srcdir)/src/egl/main \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src/loader \ - -I$(top_srcdir)/src/gbm/backends/dri \ - -I$(top_srcdir)/src/gallium/state_trackers/dri \ - -I$(top_srcdir)/src/gallium/state_trackers/omx \ - $(GALLIUM_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(WAYLAND_EGL_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(OMX_TIZONIA_CFLAGS) \ - $(OMX_TIZILHEADERS_CFLAGS) \ - $(OMX_TIZPLATFORM_CFLAGS) - -noinst_LTLIBRARIES = libomxtiztracker.la - -libomxtiztracker_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/state_trackers/osmesa/Makefile.am b/src/gallium/state_trackers/osmesa/Makefile.am deleted file mode 100644 index 05e3ca0d739..00000000000 --- a/src/gallium/state_trackers/osmesa/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = $(GALLIUM_CFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -DGALLIUM_SOFTPIPE - -noinst_LTLIBRARIES = libosmesa.la - -libosmesa_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/state_trackers/va/Makefile.am b/src/gallium/state_trackers/va/Makefile.am deleted file mode 100644 index cd548e70b35..00000000000 --- a/src/gallium/state_trackers/va/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2014 Advanced Micro Devices, 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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(VA_CFLAGS) \ - -DVA_DRIVER_INIT_FUNC="__vaDriverInit_$(VA_MAJOR)_$(VA_MINOR)" - -noinst_LTLIBRARIES = libvatracker.la - -libvatracker_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/state_trackers/vdpau/Makefile.am b/src/gallium/state_trackers/vdpau/Makefile.am deleted file mode 100644 index 8bf8945b238..00000000000 --- a/src/gallium/state_trackers/vdpau/Makefile.am +++ /dev/null @@ -1,44 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -VDPAU_MAJOR = 1 -VDPAU_MINOR = 0 - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(VDPAU_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -DVER_MAJOR=$(VDPAU_MAJOR) \ - -DVER_MINOR=$(VDPAU_MINOR) - -noinst_LTLIBRARIES = libvdpautracker.la - -libvdpautracker_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am deleted file mode 100644 index 56ead63d3a4..00000000000 --- a/src/gallium/state_trackers/xa/Makefile.am +++ /dev/null @@ -1,41 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -pedantic \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -xa_includedir = $(includedir) -xa_include_HEADERS = \ - xa_composite.h \ - xa_context.h \ - xa_tracker.h - -noinst_LTLIBRARIES = libxatracker.la - -libxatracker_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = README xa-indent.sh meson.build diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am deleted file mode 100644 index dc278099030..00000000000 --- a/src/gallium/state_trackers/xvmc/Makefile.am +++ /dev/null @@ -1,64 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(VL_CFLAGS) \ - $(X11_INCLUDES) \ - $(XCB_DRI3_CFLAGS) \ - $(XVMC_CFLAGS) - -noinst_LTLIBRARIES = libxvmctracker.la - -libxvmctracker_la_SOURCES = $(C_SOURCES) - -## The tests require the XvMC library to be installed and the wrapper to -## point to the correct library (via /etc/X11/XvMCConfig). -noinst_PROGRAMS = \ - tests/xvmc_bench \ - tests/test_context \ - tests/test_surface \ - tests/test_subpicture \ - tests/test_blocks \ - tests/test_rendering - -noinst_HEADERS = tests/testlib.h - -TEST_LIBS = $(XVMC_LIBS) -lXvMCW $(VL_LIBS) $(XCB_DRI3_LIBS) -tests_test_context_SOURCES = tests/test_context.c tests/testlib.c -tests_test_context_LDADD = $(TEST_LIBS) -tests_test_surface_SOURCES = tests/test_surface.c tests/testlib.c -tests_test_surface_LDADD = $(TEST_LIBS) -tests_test_subpicture_SOURCES = tests/test_subpicture.c tests/testlib.c -tests_test_subpicture_LDADD = $(TEST_LIBS) -tests_test_blocks_SOURCES = tests/test_blocks.c tests/testlib.c -tests_test_blocks_LDADD = $(TEST_LIBS) -tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c -tests_test_rendering_LDADD = $(TEST_LIBS) -tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c -tests_xvmc_bench_LDADD = $(TEST_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am deleted file mode 100644 index 69cebbcd16f..00000000000 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ /dev/null @@ -1,120 +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 = \ - -I$(top_srcdir)/include/D3D9 \ - -I$(top_srcdir)/src/loader \ - -I$(top_srcdir)/src/mapi/ \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common/ \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_srcdir)/src/gallium/state_trackers/nine \ - $(GALLIUM_TARGET_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -AM_CPPFLAGS = \ - $(DEFINES) - -ninedir = $(D3D_DRIVER_INSTALL_DIR) -nine_LTLIBRARIES = d3dadapter9.la - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = d3d.pc - -d3dadapter9_la_SOURCES = \ - description.c \ - getproc.c \ - drm.c - -d3dadapter9_la_LDFLAGS = \ - -shared \ - -shrext .so \ - -module \ - -no-undefined \ - -version-number $(NINE_MAJOR):$(NINE_MINOR):$(NINE_PATCH) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -d3dadapter9_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/d3dadapter9/d3dadapter9.sym -endif # HAVE_LD_VERSION_SCRIPT - -d3dadapter9_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/nine/libninetracker.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(EXPAT_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -EXTRA_d3dadapter9_la_DEPENDENCIES = d3dadapter9.sym -EXTRA_DIST = d3dadapter9.sym meson.build - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -include $(top_srcdir)/src/gallium/drivers/i915/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/softpipe/Automake.inc -include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc - -if HAVE_GALLIUM_STATIC_TARGETS - -d3dadapter9_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS) -d3dadapter9_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -d3dadapter9_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -nodist_EXTRA_d3dadapter9_la_SOURCES = dummy.cpp -d3dadapter9_la_LDFLAGS += $(LLVM_LDFLAGS) -d3dadapter9_la_LIBADD += $(LLVM_LIBS) -endif - -d3dadapterdir = $(includedir)/d3dadapter -d3dadapter_HEADERS = \ - $(top_srcdir)/include/d3dadapter/d3dadapter9.h \ - $(top_srcdir)/include/d3dadapter/drm.h \ - $(top_srcdir)/include/d3dadapter/present.h diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am deleted file mode 100644 index f53be532bb2..00000000000 --- a/src/gallium/targets/dri/Makefile.am +++ /dev/null @@ -1,143 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/gallium/state_trackers/dri \ - $(GALLIUM_TARGET_CFLAGS) - -AM_CPPFLAGS = \ - $(DEFINES) - -dridir = $(DRI_DRIVER_INSTALL_DIR) -dri_LTLIBRARIES = gallium_dri.la - -nodist_EXTRA_gallium_dri_la_SOURCES = dummy.cpp -gallium_dri_la_SOURCES = - -gallium_dri_la_LDFLAGS = \ - -shared \ - -shrext .so \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -gallium_dri_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri/dri.sym -endif # HAVE_LD_VERSION_SCRIPT - -if HAVE_LD_DYNAMIC_LIST -gallium_dri_la_LDFLAGS += \ - -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn -endif # HAVE_LD_DYNAMIC_LIST - -gallium_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ - $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \ - $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(LIBDRM_LIBS) \ - $(SELINUX_LIBS) \ - $(EXPAT_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -EXTRA_gallium_dri_la_DEPENDENCIES = \ - dri.sym \ - $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn -EXTRA_DIST = \ - SConscript \ - meson.build \ - dri.sym \ - $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -include $(top_srcdir)/src/gallium/drivers/i915/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 - -include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc -include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc -include $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc -include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc -include $(top_srcdir)/src/gallium/drivers/swr/Automake.inc - -if HAVE_GALLIUM_STATIC_TARGETS - -gallium_dri_la_SOURCES += target.c -gallium_dri_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS) -gallium_dri_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -gallium_dri_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -gallium_dri_la_LIBADD += $(LLVM_LIBS) -gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -if HAVE_COMPAT_SYMLINKS -# Add a link to allow setting LIBGL_DRIVERS_PATH to /lib/gallium of the build tree. -all-local: $(dri_LTLIBRARIES) - $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \ - $(MKDIR_P) $${link_dir}; \ - for i in $(TARGET_DRIVERS); do \ - ln -f .libs/gallium_dri.so \ - $${link_dir}/$${i}_dri.so; \ - done - -clean-local: - $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \ - $(AM_V_GEN)for i in $(TARGET_DRIVERS); do \ - $(RM) $${link_dir}/$${i}_dri.so; \ - done; -endif - -# hardlink each megadriver instance, but don't actually have -# gallium_dri.so in the set of final installed files. -install-data-hook: - for i in $(TARGET_DRIVERS); do \ - ln -f $(DESTDIR)$(dridir)/gallium_dri.so \ - $(DESTDIR)$(dridir)/$${i}_dri.so; \ - done; \ - $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \ - $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true - -uninstall-hook: - for i in $(TARGET_DRIVERS); do \ - $(RM) $(DESTDIR)$(dridir)/$${i}_dri.so; \ - done; diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am deleted file mode 100644 index 56d548e7c15..00000000000 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ /dev/null @@ -1,84 +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. - -if HAVE_SHARED_GLAPI -SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mesa/main \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/state_trackers/glx/xlib \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/winsys \ - -DGALLIUM_SOFTPIPE - -AM_CFLAGS = $(X11_INCLUDES) - -lib_LTLIBRARIES = lib@GL_LIB@.la - -nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp -lib@GL_LIB@_la_SOURCES = xlib.c -lib@GL_LIB@_la_LDFLAGS = \ - -no-undefined \ - -version-number 1:5:0 \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -lib@GL_LIB@_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/libgl-xlib/libgl-xlib.sym -endif - -lib@GL_LIB@_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \ - $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(SHARED_GLAPI_LIB) \ - $(GL_LIB_DEPS) \ - $(CLOCK_LIB) \ - $(LIBUNWIND_LIBS) - -if HAVE_GALLIUM_LLVM -lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) -AM_CPPFLAGS += -DGALLIUM_LLVMPIPE -lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -if HAVE_GALLIUM_SWR -lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS) -AM_CPPFLAGS += -DGALLIUM_SWR -endif - -EXTRA_lib@GL_LIB@_la_DEPENDENCIES = libgl-xlib.sym -EXTRA_DIST = SConscript libgl-xlib.sym meson.build - -include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am deleted file mode 100644 index 32d61a189b4..00000000000 --- a/src/gallium/targets/omx/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -if HAVE_ST_OMX_BELLAGIO -omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR) -else -omxdir = $(OMX_TIZONIA_LIB_INSTALL_DIR) -endif - -omx_LTLIBRARIES = libomx_mesa.la - -nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp -libomx_mesa_la_SOURCES = - -libomx_mesa_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -libomx_mesa_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx/omx.sym -endif # HAVE_LD_VERSION_SCRIPT - -libomx_mesa_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker_common.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -if HAVE_ST_OMX_BELLAGIO -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/state_trackers/omx/bellagio/libomxtracker.la \ - $(OMX_BELLAGIO_LIBS) -else -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/state_trackers/omx/tizonia/libomxtiztracker.la \ - $(OMX_TIZONIA_LIBS) \ - $(OMX_TIZILHEADERS_LIBS) \ - $(OMX_TIZPLATFORM_LIBS) -endif - -if HAVE_PLATFORM_X11 -libomx_mesa_la_LIBADD += \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) -endif - -EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym -EXTRA_DIST = omx.sym meson.build - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc -include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc - -libomx_mesa_la_SOURCES += target.c -libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS) -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -libomx_mesa_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -libomx_mesa_la_LIBADD += $(LLVM_LIBS) -libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS) -endif diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am deleted file mode 100644 index f0e1de7797c..00000000000 --- a/src/gallium/targets/opencl/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la - -lib@OPENCL_LIBNAME@_la_LDFLAGS = \ - $(LLVM_LDFLAGS) \ - -no-undefined \ - -version-number @OPENCL_VERSION@:0 \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -lib@OPENCL_LIBNAME@_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym -endif - -lib@OPENCL_LIBNAME@_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \ - $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(EXPAT_LIBS) \ - $(LIBELF_LIBS) \ - $(DLOPEN_LIBS) \ - -lclangCodeGen \ - -lclangFrontend \ - -lclangFrontendTool \ - -lclangDriver \ - -lclangSerialization \ - -lclangParse \ - -lclangSema \ - -lclangAnalysis \ - -lclangAST \ - -lclangEdit \ - -lclangLex \ - -lclangBasic \ - $(LLVM_LIBS) \ - $(PTHREAD_LIBS) - -nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp -lib@OPENCL_LIBNAME@_la_SOURCES = - -EXTRA_lib@OPENCL_LIBNAME@_la_DEPENDENCIES = opencl.sym -EXTRA_DIST = mesa.icd opencl.sym meson.build - -if HAVE_CLOVER_ICD -icddir = $(sysconfdir)/OpenCL/vendors/ -icd_DATA = mesa.icd -endif - -include $(top_srcdir)/install-gallium-links.mk diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am deleted file mode 100644 index dc4d49e1072..00000000000 --- a/src/gallium/targets/osmesa/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -# -# 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_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -DGALLIUM_SOFTPIPE - -lib_LTLIBRARIES = lib@OSMESA_LIB@.la - -nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp -lib@OSMESA_LIB@_la_SOURCES = target.c - -lib@OSMESA_LIB@_la_LDFLAGS = \ - -no-undefined \ - -version-number @OSMESA_VERSION@ \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -lib@OSMESA_LIB@_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/osmesa/osmesa.sym -endif - -if HAVE_SHARED_GLAPI -SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -endif - -lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(SHARED_GLAPI_LIB) \ - $(OSMESA_LIB_DEPS) \ - $(CLOCK_LIB) \ - $(LIBUNWIND_LIBS) - -if HAVE_GALLIUM_LLVM -AM_CPPFLAGS += -DGALLIUM_LLVMPIPE -lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) -lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) -endif - -if HAVE_GALLIUM_SWR -AM_CPPFLAGS += -DGALLIUM_SWR -lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS) -lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la $(LLVM_LIBS) -endif - -EXTRA_lib@OSMESA_LIB@_la_DEPENDENCIES = osmesa.sym -EXTRA_DIST = \ - osmesa.sym \ - osmesa.def \ - osmesa.mingw.def \ - SConscript \ - meson.build - -include $(top_srcdir)/install-gallium-links.mk - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = osmesa.pc diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am deleted file mode 100644 index 864ee8d50d3..00000000000 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ /dev/null @@ -1,212 +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_CPPFLAGS = \ - $(GALLIUM_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - -I$(top_builddir)/src/util \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -pipedir = $(libdir)/gallium-pipe -pipe_LTLIBRARIES = - -PIPE_LIBS = - -if NEED_GALLIUM_VL -PIPE_LIBS += \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la -else -PIPE_LIBS += \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la -endif - -if NEED_GALLIUM_VL_WINSYS -PIPE_LIBS+= \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la -endif - -PIPE_LIBS += \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) - -AM_LDFLAGS = \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) - -if HAVE_LD_VERSION_SCRIPT -AM_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym -endif - -if HAVE_GALLIUM_LLVM -PIPE_LIBS += $(LLVM_LIBS) -AM_LDFLAGS += $(LLVM_LDFLAGS) -endif - -if HAVE_GALLIUM_I915 -pipe_LTLIBRARIES += pipe_i915.la - -pipe_i915_la_SOURCES = pipe_i915.c -nodist_EXTRA_pipe_i915_la_SOURCES = dummy.cpp -pipe_i915_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ - $(top_builddir)/src/gallium/drivers/i915/libi915.la \ - $(LIBDRM_LIBS) \ - $(I915_LIBS) - -endif - -if HAVE_GALLIUM_NOUVEAU -pipe_LTLIBRARIES += pipe_nouveau.la - -pipe_nouveau_la_SOURCES = pipe_nouveau.c -nodist_EXTRA_pipe_nouveau_la_SOURCES = dummy.cpp -pipe_nouveau_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ - $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ - $(LIBDRM_LIBS) \ - $(NOUVEAU_LIBS) - -endif - -if HAVE_GALLIUM_R300 -pipe_LTLIBRARIES += pipe_r300.la - -pipe_r300_la_SOURCES = pipe_r300.c -nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp -pipe_r300_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(LIBDRM_LIBS) \ - $(RADEON_LIBS) - -endif - -if HAVE_GALLIUM_R600 -pipe_LTLIBRARIES += pipe_r600.la - -pipe_r600_la_SOURCES = pipe_r600.c -nodist_EXTRA_pipe_r600_la_SOURCES = dummy.cpp -pipe_r600_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(LIBDRM_LIBS) \ - $(RADEON_LIBS) \ - $(LIBELF_LIBS) -endif - -if HAVE_GALLIUM_RADEONSI -pipe_LTLIBRARIES += pipe_radeonsi.la - -pipe_radeonsi_la_SOURCES = pipe_radeonsi.c -nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp -pipe_radeonsi_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(top_builddir)/src/amd/common/libamd_common.la \ - $(top_builddir)/src/util/libxmlconfig.la \ - $(LIBDRM_LIBS) \ - $(RADEON_LIBS) \ - $(AMDGPU_LIBS) - -endif - -if HAVE_GALLIUM_FREEDRENO -pipe_LTLIBRARIES += pipe_msm.la - -pipe_msm_la_SOURCES = pipe_msm.c -nodist_EXTRA_pipe_msm_la_SOURCES = dummy.cpp -pipe_msm_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ - $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ - $(top_builddir)/src/freedreno/libfreedreno_drm.la \ - $(top_builddir)/src/freedreno/libfreedreno_ir3.la \ - $(LIBDRM_LIBS) \ - $(FREEDRENO_LIBS) - -endif - -if HAVE_GALLIUM_SVGA -pipe_LTLIBRARIES += pipe_vmwgfx.la - -pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c -nodist_EXTRA_pipe_vmwgfx_la_SOURCES = dummy.cpp - -pipe_vmwgfx_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ - $(top_builddir)/src/gallium/drivers/svga/libsvga.la \ - $(LIBDRM_LIBS) - -endif - -if HAVE_GALLIUM_SWRAST -pipe_LTLIBRARIES += pipe_swrast.la -pipe_swrast_la_SOURCES = pipe_swrast.c -nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp -pipe_swrast_la_LIBADD = $(PIPE_LIBS) - -if HAVE_GALLIUM_SOFTPIPE -AM_CPPFLAGS += -DGALLIUM_SOFTPIPE - -pipe_swrast_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la -endif - -if HAVE_GALLIUM_LLVMPIPE -AM_CPPFLAGS += -DGALLIUM_LLVMPIPE - -pipe_swrast_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la -endif - -if HAVE_GALLIUM_SWR -AM_CPPFLAGS += -DGALLIUM_SWR - -pipe_swrast_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la -endif - -pipe_swrast_la_LIBADD += \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) - -endif - -EXTRA_DIST = pipe.sym meson.build diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am deleted file mode 100644 index 0f2fe14594b..00000000000 --- a/src/gallium/targets/va/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -vadir = $(VA_LIB_INSTALL_DIR) -va_LTLIBRARIES = gallium_drv_video.la - -nodist_EXTRA_gallium_drv_video_la_SOURCES = dummy.cpp -gallium_drv_video_la_SOURCES = - -gallium_drv_video_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -avoid-version \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -gallium_drv_video_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/va/va.sym -endif # HAVE_LD_VERSION_SCRIPT - -# NOTE: gallium_drv_video does not use(link against) libva -gallium_drv_video_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/va/libvatracker.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -if HAVE_PLATFORM_X11 -gallium_drv_video_la_LIBADD += \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) -endif - -EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym -EXTRA_DIST = va.sym meson.build - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc -include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc - -gallium_drv_video_la_SOURCES += target.c -gallium_drv_video_la_CPPFLAGS = $(TARGET_CPPFLAGS) -gallium_drv_video_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -gallium_drv_video_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -gallium_drv_video_la_LIBADD += $(LLVM_LIBS) -gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -# hardlink each megadriver instance, but don't actually have -# gallium_drv_video.so in the set of final installed files. -install-data-hook: - for i in $(TARGET_DRIVERS); do \ - ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ - $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ - done; \ - $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* - -uninstall-hook: - for i in $(TARGET_DRIVERS); do \ - $(RM) $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ - done; diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am deleted file mode 100644 index 2742c7acd44..00000000000 --- a/src/gallium/targets/vdpau/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -vdpaudir = $(VDPAU_LIB_INSTALL_DIR) -vdpau_LTLIBRARIES = libvdpau_gallium.la - -nodist_EXTRA_libvdpau_gallium_la_SOURCES = dummy.cpp -libvdpau_gallium_la_SOURCES = - -libvdpau_gallium_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -libvdpau_gallium_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau/vdpau.sym -endif # HAVE_LD_VERSION_SCRIPT - -if HAVE_LD_DYNAMIC_LIST -libvdpau_gallium_la_LDFLAGS += \ - -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn -endif # HAVE_LD_DYNAMIC_LIST - -# NOTE: libvdpau_gallium does not use(link against) libvdpau -libvdpau_gallium_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -EXTRA_libvdpau_gallium_la_DEPENDENCIES = \ - vdpau.sym \ - $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn -EXTRA_DIST = \ - vdpau.sym \ - $(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \ - meson.build - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -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 - -if HAVE_GALLIUM_STATIC_TARGETS - -libvdpau_gallium_la_SOURCES += target.c -libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS) -libvdpau_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS - -libvdpau_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -libvdpau_gallium_la_LIBADD += $(LLVM_LIBS) -libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -if HAVE_COMPAT_SYMLINKS -# Add a link to allow setting VDPAU_DRIVER_PATH to /lib/gallium of the build tree. -all-local: $(vdpau_LTLIBRARIES) - $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \ - $(MKDIR_P) $${link_dir}; \ - for i in $(TARGET_DRIVERS); do \ - j=libvdpau_gallium.$(LIB_EXT); \ - k=libvdpau_$${i}.$(LIB_EXT); \ - l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ - ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ - $${link_dir}/$${l}; \ - ln -sf $${l} \ - $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ - ln -sf $${l} \ - $${link_dir}/$${k}.$(VDPAU_MAJOR); \ - ln -sf $${l} \ - $${link_dir}/$${k}; \ - done - -clean-local: - $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium; \ - $(AM_V_GEN)for i in $(TARGET_DRIVERS); do \ - $(RM) $${link_dir}/libvdpau_$${i}.so{,.$(VDPAU_MAJOR){,.$(VDPAU_MINOR){,.0}}}; \ - done; -endif - -# hardlink each megadriver instance, but don't actually have -# libvdpau_gallium.so in the set of final installed files. -install-data-hook: - $(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \ - for i in $(TARGET_DRIVERS); do \ - j=libvdpau_gallium.$(LIB_EXT); \ - k=libvdpau_$${i}.$(LIB_EXT); \ - l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ - ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ - $${dest_dir}/$${l}; \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(VDPAU_MAJOR); \ - ln -sf $${l} \ - $${dest_dir}/$${k}; \ - done; \ - $(RM) $${dest_dir}/libvdpau_gallium.*; \ - $(RM) -d $${dest_dir} &>/dev/null || true - -uninstall-hook: - for i in $(TARGET_DRIVERS); do \ - $(RM) $(DESTDIR)$(vdpaudir)/libvdpau_$${i}.so{,.$(VDPAU_MAJOR){,.$(VDPAU_MINOR){,.0}}}; \ - done; diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am deleted file mode 100644 index 2238a7ea81f..00000000000 --- a/src/gallium/targets/xa/Makefile.am +++ /dev/null @@ -1,90 +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) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xatracker.pc - -lib_LTLIBRARIES = libxatracker.la - -nodist_EXTRA_libxatracker_la_SOURCES = dummy.cpp -libxatracker_la_SOURCES = - -libxatracker_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/compiler/glsl/libglsl.la \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -libxatracker_la_LDFLAGS = \ - -no-undefined \ - -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_PATCH) \ - $(GC_SECTIONS) - -if HAVE_LD_VERSION_SCRIPT -libxatracker_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xa/xa.sym -endif - -EXTRA_libxatracker_la_DEPENDENCIES = xa.sym -EXTRA_DIST = xa.sym meson.build - -if HAVE_GALLIUM_STATIC_TARGETS - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc - -libxatracker_la_SOURCES += target.c -libxatracker_la_CPPFLAGS = $(TARGET_CPPFLAGS) -libxatracker_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) - -else # HAVE_GALLIUM_STATIC_TARGETS - -libxatracker_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -libxatracker_la_LIBADD += $(LLVM_LIBS) -libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -include $(top_srcdir)/install-lib-links.mk diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am deleted file mode 100644 index 45b1d860692..00000000000 --- a/src/gallium/targets/xvmc/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_TARGET_CFLAGS) - -xvmcdir = $(XVMC_LIB_INSTALL_DIR) -xvmc_LTLIBRARIES = libXvMCgallium.la - -nodist_EXTRA_libXvMCgallium_la_SOURCES = dummy.cpp -libXvMCgallium_la_SOURCES = - -libXvMCgallium_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -if HAVE_LD_VERSION_SCRIPT -libXvMCgallium_la_LDFLAGS += \ - -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc/xvmc.sym -endif # HAVE_LD_VERSION_SCRIPT - -libXvMCgallium_la_LIBADD = \ - $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(XVMC_LIBS) \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) \ - $(LIBDRM_LIBS) \ - $(GALLIUM_COMMON_LIB_DEPS) - -EXTRA_libXvMCgallium_la_DEPENDENCIES = xvmc.sym -EXTRA_DIST = xvmc.sym meson.build - -TARGET_DRIVERS = -TARGET_CPPFLAGS = -TARGET_LIB_DEPS = - -include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc - -include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc - -if HAVE_GALLIUM_STATIC_TARGETS - -libXvMCgallium_la_SOURCES += target.c -libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS) -libXvMCgallium_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(TARGET_LIB_DEPS) \ - $(TARGET_COMPILER_LIB_DEPS) \ - $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) - -else # HAVE_GALLIUM_STATIC_TARGETS -libXvMCgallium_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la - -endif # HAVE_GALLIUM_STATIC_TARGETS - -if HAVE_GALLIUM_LLVM -libXvMCgallium_la_LIBADD += $(LLVM_LIBS) -libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS) -endif - -# hardlink each megadriver instance, but don't actually have -# libXvMCgallium.so in the set of final installed files. -install-data-hook: - $(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir); \ - for i in $(TARGET_DRIVERS); do \ - j=libXvMCgallium.$(LIB_EXT); \ - k=libXvMC$${i}.$(LIB_EXT); \ - l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ - ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ - $${dest_dir}/$${l}; \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(XVMC_MAJOR); \ - ln -sf $${l} \ - $${dest_dir}/$${k}; \ - done; \ - $(RM) $${dest_dir}/libXvMCgallium.*; \ - $(RM) -d $${dest_dir} &>/dev/null || true - -uninstall-hook: - for i in $(TARGET_DRIVERS); do \ - $(RM) $(DESTDIR)$(xvmcdir)/libXvMC$${i}.so{,.$(XVMC_MAJOR){,.$(XVMC_MINOR){,.0}}}; \ - done; diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am deleted file mode 100644 index db9a54ff0ad..00000000000 --- a/src/gallium/tests/trivial/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -PIPE_SRC_DIR = $(top_builddir)/src/gallium/targets/pipe-loader - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) - -LDADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_dynamic.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(GALLIUM_COMMON_LIB_DEPS) - -noinst_PROGRAMS = compute tri quad-tex - -compute_SOURCES = compute.c - -tri_SOURCES = tri.c - -quad_tex_SOURCES = quad-tex.c - -EXTRA_DIST = meson.build - -clean-local: - -rm -f result.bmp diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am deleted file mode 100644 index 74d125fe449..00000000000 --- a/src/gallium/tests/unit/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# TODO: wire up some useful tests to make check - -include $(top_srcdir)/src/gallium/Automake.inc - -EXTRA_DIST = SConscript meson.build - -AM_CFLAGS = \ - $(GALLIUM_CFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys - -LDADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(GALLIUM_COMMON_LIB_DEPS) - -noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \ - u_format_test u_format_compatible_test translate_test - -pipe_barrier_test_SOURCES = pipe_barrier_test.c - -u_cache_test_SOURCES = u_cache_test.c - -u_half_test_SOURCES = u_half_test.c - -u_format_test_SOURCES = u_format_test.c - -u_format_compatible_test_SOURCES = u_format_compatible_test.c - -translate_test_SOURCES = translate_test.c diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.am b/src/gallium/winsys/amdgpu/drm/Makefile.am deleted file mode 100644 index 1c2ec010fc6..00000000000 --- a/src/gallium/winsys/amdgpu/drm/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(AMDGPU_CFLAGS) \ - $(LLVM_CFLAGS) \ - -I$(top_srcdir)/src/amd/ - -AM_CXXFLAGS = $(AM_CFLAGS) - -noinst_LTLIBRARIES = libamdgpuwinsys.la - -libamdgpuwinsys_la_LIBADD = \ - $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la - -libamdgpuwinsys_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/etnaviv/drm/Makefile.am b/src/gallium/winsys/etnaviv/drm/Makefile.am deleted file mode 100644 index 3cc54c8ad13..00000000000 --- a/src/gallium/winsys/etnaviv/drm/Makefile.am +++ /dev/null @@ -1,35 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_CFLAGS) \ - $(ETNAVIV_CFLAGS) - -noinst_LTLIBRARIES = libetnavivdrm.la - -libetnavivdrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am deleted file mode 100644 index 16184dfd935..00000000000 --- a/src/gallium/winsys/freedreno/drm/Makefile.am +++ /dev/null @@ -1,37 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/freedreno \ - -I$(top_srcdir)/src/freedreno/registers \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(FREEDRENO_CFLAGS) - -noinst_LTLIBRARIES = libfreedrenodrm.la - -libfreedrenodrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am deleted file mode 100644 index 0b06f9df876..00000000000 --- a/src/gallium/winsys/i915/drm/Makefile.am +++ /dev/null @@ -1,35 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(I915_CFLAGS) - -noinst_LTLIBRARIES = libi915drm.la - -libi915drm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/kmsro/drm/Makefile.am b/src/gallium/winsys/kmsro/drm/Makefile.am deleted file mode 100644 index 8c51839b064..00000000000 --- a/src/gallium/winsys/kmsro/drm/Makefile.am +++ /dev/null @@ -1,48 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(LIBDRM_CFLAGS) - -if HAVE_GALLIUM_ETNAVIV -AM_CFLAGS += -DGALLIUM_ETNAVIV -endif - -if HAVE_GALLIUM_VC4 -AM_CFLAGS += -DGALLIUM_VC4 -endif - -if HAVE_GALLIUM_FREEDRENO -AM_CFLAGS += -DGALLIUM_FREEDRENO -endif - -noinst_LTLIBRARIES = libkmsrodrm.la - -libkmsrodrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am deleted file mode 100644 index 992fa25cc11..00000000000 --- a/src/gallium/winsys/nouveau/drm/Makefile.am +++ /dev/null @@ -1,35 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(NOUVEAU_CFLAGS) - -noinst_LTLIBRARIES = libnouveaudrm.la - -libnouveaudrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/panfrost/drm/Makefile.am b/src/gallium/winsys/panfrost/drm/Makefile.am deleted file mode 100644 index 7a836288b02..00000000000 --- a/src/gallium/winsys/panfrost/drm/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2014 Broadco -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libpanfrostdrm.la - -libpanfrostdrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am deleted file mode 100644 index c94c9b3a9c4..00000000000 --- a/src/gallium/winsys/radeon/drm/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(RADEON_CFLAGS) - -noinst_LTLIBRARIES = libradeonwinsys.la - -libradeonwinsys_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am deleted file mode 100644 index 46bf5d85f9d..00000000000 --- a/src/gallium/winsys/svga/drm/Makefile.am +++ /dev/null @@ -1,36 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers/svga \ - -I$(top_srcdir)/src/gallium/drivers/svga/include \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES = libsvgadrm.la - -libsvgadrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am deleted file mode 100644 index ecf63d17da9..00000000000 --- a/src/gallium/winsys/sw/dri/Makefile.am +++ /dev/null @@ -1,33 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libswdri.la - -libswdri_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.am b/src/gallium/winsys/sw/kms-dri/Makefile.am deleted file mode 100644 index 022f3c508da..00000000000 --- a/src/gallium/winsys/sw/kms-dri/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright © 2012 Intel Corporation -# 2013 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. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES = libswkmsdri.la - -libswkmsdri_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am deleted file mode 100644 index c2051891931..00000000000 --- a/src/gallium/winsys/sw/null/Makefile.am +++ /dev/null @@ -1,33 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libws_null.la - -libws_null_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am deleted file mode 100644 index 7cd03a4c2b9..00000000000 --- a/src/gallium/winsys/sw/wrapper/Makefile.am +++ /dev/null @@ -1,33 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libwsw.la - -libwsw_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am deleted file mode 100644 index e518dda82f4..00000000000 --- a/src/gallium/winsys/sw/xlib/Makefile.am +++ /dev/null @@ -1,34 +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 Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(X11_INCLUDES) - -noinst_LTLIBRARIES = libws_xlib.la - -libws_xlib_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = SConscript meson.build diff --git a/src/gallium/winsys/tegra/drm/Makefile.am b/src/gallium/winsys/tegra/drm/Makefile.am deleted file mode 100644 index 9a8169889cf..00000000000 --- a/src/gallium/winsys/tegra/drm/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libtegradrm.la - -libtegradrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = \ - meson.build diff --git a/src/gallium/winsys/v3d/drm/Makefile.am b/src/gallium/winsys/v3d/drm/Makefile.am deleted file mode 100644 index ac2ef23bb64..00000000000 --- a/src/gallium/winsys/v3d/drm/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2014 Broadcom -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libv3ddrm.la - -libv3ddrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/vc4/drm/Makefile.am b/src/gallium/winsys/vc4/drm/Makefile.am deleted file mode 100644 index a32709bffaf..00000000000 --- a/src/gallium/winsys/vc4/drm/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2014 Broadcom -# -# 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libvc4drm.la - -libvc4drm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am deleted file mode 100644 index e543227e39e..00000000000 --- a/src/gallium/winsys/virgl/drm/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright © 2015 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. - -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) \ - $(LIBDRM_CFLAGS) - -noinst_LTLIBRARIES = libvirgldrm.la - -libvirgldrm_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am deleted file mode 100644 index 0a31477a1f2..00000000000 --- a/src/gallium/winsys/virgl/vtest/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright © 2015 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 -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - $(GALLIUM_WINSYS_CFLAGS) - -noinst_LTLIBRARIES = libvirglvtest.la - -libvirglvtest_la_SOURCES = $(C_SOURCES) - -EXTRA_DIST = meson.build diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am deleted file mode 100644 index bb246ecebf5..00000000000 --- a/src/gbm/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -include Makefile.sources - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = main/gbm.pc - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/loader \ - -I$(top_srcdir)/src/gbm/main \ - $(DLOPEN_CFLAGS) \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) - -lib_LTLIBRARIES = libgbm.la -include_HEADERS = main/gbm.h - -libgbm_la_SOURCES = \ - $(gbm_core_FILES) - -libgbm_la_LDFLAGS = \ - -no-undefined \ - -version-info 1:0 \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -libgbm_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/util/libxmlconfig.la \ - $(DLOPEN_LIBS) - -if HAVE_PLATFORM_WAYLAND -AM_CFLAGS += \ - $(WAYLAND_SERVER_CFLAGS) \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm/ -libgbm_la_LIBADD += $(WAYLAND_SERVER_LIBS) -endif - -if HAVE_DRI2 -libgbm_la_SOURCES += \ - $(gbm_dri_FILES) - -AM_CFLAGS += \ - $(LIBDRM_CFLAGS) \ - $(PTHREADSTUBS_CFLAGS) - -libgbm_la_LIBADD += \ - $(LIBDRM_LIBS) \ - $(PTHREADSTUBS_LIBS) -endif - -TESTS = gbm-symbols-check -EXTRA_DIST = gbm-symbols-check meson.build - -include $(top_srcdir)/install-lib-links.mk diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am deleted file mode 100644 index a66957d609b..00000000000 --- a/src/glx/Makefile.am +++ /dev/null @@ -1,195 +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. - - -SUBDIRS = - -EXTRA_DIST = SConscript meson.build - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/GL/internal \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/loader \ - -I$(top_builddir)/src/mapi \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ - $(VISIBILITY_CFLAGS) \ - -D_REENTRANT \ - $(DEFINES) \ - $(LIBDRM_CFLAGS) \ - $(DRI2PROTO_CFLAGS) \ - $(GLPROTO_CFLAGS) \ - $(X11_INCLUDES) - -lib_LTLIBRARIES = lib@GL_LIB@.la - -noinst_LTLIBRARIES = libglx.la - -libglx_la_SOURCES = \ - clientattrib.c \ - clientinfo.c \ - compsize.c \ - create_context.c \ - eval.c \ - glxclient.h \ - glxcmds.c \ - glxconfig.c \ - glxconfig.h \ - glxcurrent.c \ - glx_error.c \ - glx_error.h \ - glxext.c \ - glxextensions.c \ - glxextensions.h \ - glxhash.c \ - glxhash.h \ - glx_pbuffer.c \ - glx_query.c \ - indirect.c \ - indirect_glx.c \ - indirect_init.c \ - indirect_init.h \ - indirect_size.c \ - indirect_texture_compression.c \ - indirect_transpose_matrix.c \ - indirect_vertex_array.c \ - indirect_vertex_array.h \ - indirect_vertex_array_priv.h \ - indirect_vertex_program.c \ - indirect_window_pos.c \ - packrender.h \ - packsingle.h \ - pixel.c \ - pixelstore.c \ - query_renderer.c \ - render2.c \ - renderpix.c \ - single2.c \ - singlepix.c \ - vertarr.c - -libglx_la_LIBADD = \ - $(top_builddir)/src/loader/libloader.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/util/libxmlconfig.la - -if HAVE_DRISW -libglx_la_SOURCES += \ - drisw_glx.c \ - drisw_priv.h -endif - -if HAVE_DRICOMMON -libglx_la_SOURCES += \ - dri_common.c \ - dri_common.h \ - dri_common_query_renderer.c \ - dri_common_interop.c \ - xfont.c -endif - -if HAVE_DRI2 -libglx_la_SOURCES += \ - dri2.c \ - dri2_glx.c \ - dri2.h \ - dri2_priv.h \ - dri_glx.c \ - dri_sarea.h \ - XF86dri.c \ - xf86dri.h \ - xf86dristr.h -endif - -if HAVE_DRI3 -libglx_la_SOURCES += \ - dri3_glx.c \ - dri3_priv.h - -libglx_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la -endif - -if HAVE_APPLEDRI -libglx_la_SOURCES += \ - applegl_glx.c - -SUBDIRS += apple -libglx_la_LIBADD += $(builddir)/apple/libappleglx.la -endif - -if HAVE_WINDOWSDRI -libglx_la_SOURCES += \ - driwindows_glx.c - -SUBDIRS += windows -libglx_la_LIBADD += \ - $(builddir)/windows/libwindowsdri.la \ - $(builddir)/windows/libwindowsglx.la -endif - -if USE_LIBGLVND -AM_CFLAGS += \ - -DGL_LIB_NAME=\"lib@GL_LIB@.so.0\" \ - $(GLVND_CFLAGS) - -libglx_la_SOURCES += \ - g_glxglvnddispatchfuncs.c \ - g_glxglvnddispatchindices.h \ - glxglvnd.c \ - glxglvnd.h \ - glxglvnddispatchfuncs.h - -GL_LIB_VERSION=0 -else -AM_CFLAGS += \ - -DGL_LIB_NAME=\"lib@GL_LIB@.so.1\" -GL_LIB_VERSION=1:2 -endif - -# Push the libdrm furhter up, as due to libtool bug we might end up relinking -# against the system one. -GL_LIBS = \ - $(LIBDRM_LIBS) \ - libglx.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(GL_LIB_DEPS) - -GL_LDFLAGS = \ - -no-undefined \ - -version-number $(GL_LIB_VERSION) \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -lib@GL_LIB@_la_SOURCES = -lib@GL_LIB@_la_LIBADD = $(GL_LIBS) -lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) - -if HAVE_WINDOWSDRI -lib@GL_LIB@_la_LDFLAGS += -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup -endif - -SUBDIRS += . tests - -include $(top_srcdir)/install-lib-links.mk diff --git a/src/glx/apple/Makefile.am b/src/glx/apple/Makefile.am deleted file mode 100644 index 8f932686359..00000000000 --- a/src/glx/apple/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -EXTRA_DIST = \ - RELEASE_NOTES \ - meson.build - -noinst_LTLIBRARIES = libappleglx.la - -AM_CFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/glx \ - -I$(top_builddir)/src/mesa \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ - $(VISIBILITY_CFLAGS) \ - $(DEFINES) \ - $(X11_INCLUDES) - -libappleglx_la_SOURCES = \ - apple_cgl.c \ - apple_cgl.h \ - appledri.c \ - appledri.h \ - appledristr.h \ - apple_glapi.c \ - apple_glx.c \ - apple_glx_context.c \ - apple_glx_context.h \ - apple_glx_drawable.c \ - apple_glx_drawable.h \ - apple_glx.h \ - apple_glx_log.c \ - apple_glx_log.h \ - apple_glx_pbuffer.c \ - apple_glx_pixmap.c \ - apple_glx_surface.c \ - apple_visual.c \ - apple_visual.h \ - apple_xgl_api.h \ - apple_xgl_api_read.c \ - apple_xgl_api_stereo.c \ - apple_xgl_api_viewport.c \ - glx_empty.c - -libappleglx_la_LDFLAGS = -lXplugin -framework ApplicationServices -framework CoreFoundation diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am deleted file mode 100644 index 07173164f23..00000000000 --- a/src/glx/tests/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -if HAVE_SHARED_GLAPI -AM_CFLAGS = $(PTHREAD_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/glx \ - -I$(top_srcdir)/src/glx \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/GL/internal \ - $(DEFINES) \ - $(LIBDRM_CFLAGS) \ - $(X11_INCLUDES) - -TESTS = glx-test dispatch-index-check -check_PROGRAMS = glx-test -EXTRA_DIST = dispatch-index-check meson.build - -glx_test_SOURCES = \ - clientinfo_unittest.cpp \ - create_context_unittest.cpp \ - enum_sizes.cpp \ - fake_glx_screen.cpp \ - fake_glx_screen.h \ - indirect_api.cpp \ - mock_xdisplay.h \ - query_renderer_unittest.cpp - -if HAVE_DRI2 -glx_test_SOURCES += \ - query_renderer_implementation_unittest.cpp -endif - -glx_test_LDADD = \ - $(top_builddir)/src/glx/libglx.la \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(PTHREAD_LIBS) -endif diff --git a/src/glx/windows/Makefile.am b/src/glx/windows/Makefile.am deleted file mode 100644 index 828a930e53f..00000000000 --- a/src/glx/windows/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -noinst_LTLIBRARIES = libwindowsdri.la libwindowsglx.la - -# protocol defines for the Windows-DRI server extension -windowsdriincludedir = $(includedir)/X11/extensions -windowsdriinclude_HEADERS = windowsdriconst.h windowsdristr.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = windowsdriproto.pc - -# library for using the Windows-DRI server extension -libwindowsdri_la_SOURCES = xwindowsdri.c xwindowsdri.h - -libwindowsdri_la_CFLAGS = \ - $(X11_INCLUDES) - -# native rendering GL for windows -libwindowsglx_la_SOURCES = \ - windowsgl.c \ - windowsgl.h \ - windowsgl_internal.h \ - windows_drawable.c \ - wgl.c \ - wgl.h - -libwindowsglx_la_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/glx \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ - $(VISIBILITY_CFLAGS) \ - $(DEFINES) \ - $(X11_INCLUDES) - -EXTRA_DIST = meson.build diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am deleted file mode 100644 index 23b75536109..00000000000 --- a/src/gtest/Makefile.am +++ /dev/null @@ -1,41 +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. - -AM_CFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include -AM_CXXFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include - -check_LTLIBRARIES = libgtest.la - -libgtest_la_SOURCES = \ - src/gtest-all.cc \ - src/gtest_main.cc - -EXTRA_DIST = \ - include \ - src/gtest.cc \ - src/gtest-death-test.cc \ - src/gtest-filepath.cc \ - src/gtest-internal-inl.h \ - src/gtest-port.cc \ - src/gtest-printers.cc \ - src/gtest-test-part.cc \ - src/gtest-typed-test.cc \ - meson.build diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am deleted file mode 100644 index b4d6a978a85..00000000000 --- a/src/intel/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright © 2016 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 Makefile.sources - -# 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_builddir)/src/compiler/glsl \ - -I$(top_srcdir)/src/compiler/glsl \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_builddir)/src/intel \ - -I$(top_srcdir)/src/intel \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/include \ - $(VALGRIND_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(DEFINES) - -AM_CFLAGS = \ - $(VISIBILITY_CFLAGS) \ - $(WNO_OVERRIDE_INIT) - -AM_CXXFLAGS = \ - $(VISIBILITY_CXXFLAGS) - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -lib_LTLIBRARIES = -check_LTLIBRARIES = -noinst_DATA = -noinst_HEADERS = -noinst_LTLIBRARIES = -noinst_PROGRAMS = -check_PROGRAMS = -TESTS = -BUILT_SOURCES = -CLEANFILES = -EXTRA_DIST = \ - blorp/meson.build \ - common/meson.build \ - compiler/meson.build \ - dev/meson.build \ - genxml/meson.build \ - isl/meson.build \ - tools/aubinator_viewer.cpp \ - tools/aubinator_viewer.h \ - tools/aubinator_viewer_decoder.cpp \ - tools/aubinator_viewer_urb.h \ - tools/imgui/imgui_impl_gtk3.cpp \ - tools/imgui/imgui_impl_gtk3.h \ - tools/imgui/imgui_impl_opengl3.cpp \ - tools/imgui/imgui_impl_opengl3.h \ - tools/imgui/meson.build \ - tools/intel_sanitize_gpu.c \ - tools/intel_sanitize_gpu.in \ - tools/intel_dump_gpu.c \ - tools/intel_dump_gpu.in \ - tools/meson.build \ - vulkan/meson.build \ - meson.build - -include Makefile.blorp.am -include Makefile.common.am -include Makefile.compiler.am -include Makefile.dev.am -include Makefile.genxml.am -include Makefile.isl.am -include Makefile.tools.am - -include Makefile.vulkan.am - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/intel/Makefile.blorp.am b/src/intel/Makefile.blorp.am deleted file mode 100644 index 971c1bad06f..00000000000 --- a/src/intel/Makefile.blorp.am +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2015-2016 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. - -noinst_LTLIBRARIES += blorp/libblorp.la - -blorp_libblorp_la_SOURCES = $(BLORP_FILES) - -EXTRA_DIST += blorp/TODO diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am deleted file mode 100644 index 443cefc522a..00000000000 --- a/src/intel/Makefile.common.am +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright © 2016 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. - -noinst_LTLIBRARIES += common/libintel_common.la - -common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS) -common_libintel_common_la_SOURCES = $(COMMON_FILES) -common_libintel_common_la_LIBADD = $(EXPAT_LIBS) - -if HAVE_PLATFORM_ANDROID -common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS) -common_libintel_common_la_LIBADD += $(ANDROID_LIBS) -endif diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am deleted file mode 100644 index 7c33e35816b..00000000000 --- a/src/intel/Makefile.compiler.am +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2015-2016 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. - -noinst_LTLIBRARIES += compiler/libintel_compiler.la - -compiler_libintel_compiler_la_CPPFLAGS = \ - -I$(top_builddir)/src/intel/compiler \ - -I$(top_srcdir)/src/intel/compiler \ - $(AM_CPPFLAGS) - -compiler_libintel_compiler_la_SOURCES = \ - $(COMPILER_FILES) \ - $(COMPILER_GENERATED_FILES) - -BUILT_SOURCES += $(COMPILER_GENERATED_FILES) - -compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \ - $(top_srcdir)/src/compiler/nir/nir_algebraic.py - $(MKDIR_GEN) - $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false) - -EXTRA_DIST += \ - compiler/brw_nir_trig_workarounds.py - -# ---------------------------------------------------------------------------- -# Tests -# ---------------------------------------------------------------------------- - -TEST_LIBS = \ - $(top_builddir)/src/gtest/libgtest.la \ - compiler/libintel_compiler.la \ - common/libintel_common.la \ - dev/libintel_dev.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/intel/isl/libisl.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -COMPILER_TESTS = \ - compiler/test_fs_cmod_propagation \ - compiler/test_fs_copy_propagation \ - compiler/test_fs_saturate_propagation \ - compiler/test_eu_compact \ - compiler/test_eu_validate \ - compiler/test_vf_float_conversions \ - compiler/test_vec4_cmod_propagation \ - compiler/test_vec4_copy_propagation \ - compiler/test_vec4_dead_code_eliminate \ - compiler/test_vec4_register_coalesce - -TESTS += $(COMPILER_TESTS) -check_PROGRAMS += $(COMPILER_TESTS) - -compiler_test_fs_cmod_propagation_SOURCES = \ - compiler/test_fs_cmod_propagation.cpp -compiler_test_fs_cmod_propagation_LDADD = $(TEST_LIBS) - -compiler_test_fs_copy_propagation_SOURCES = \ - compiler/test_fs_copy_propagation.cpp -compiler_test_fs_copy_propagation_LDADD = $(TEST_LIBS) - -compiler_test_fs_saturate_propagation_SOURCES = \ - compiler/test_fs_saturate_propagation.cpp -compiler_test_fs_saturate_propagation_LDADD = $(TEST_LIBS) - -compiler_test_vf_float_conversions_SOURCES = \ - compiler/test_vf_float_conversions.cpp -compiler_test_vf_float_conversions_LDADD = $(TEST_LIBS) - -compiler_test_vec4_register_coalesce_SOURCES = \ - compiler/test_vec4_register_coalesce.cpp -compiler_test_vec4_register_coalesce_LDADD = $(TEST_LIBS) - -compiler_test_vec4_copy_propagation_SOURCES = \ - compiler/test_vec4_copy_propagation.cpp -compiler_test_vec4_copy_propagation_LDADD = $(TEST_LIBS) - -compiler_test_vec4_cmod_propagation_SOURCES = \ - compiler/test_vec4_cmod_propagation.cpp -compiler_test_vec4_cmod_propagation_LDADD = $(TEST_LIBS) - -compiler_test_vec4_dead_code_eliminate_SOURCES = \ - compiler/test_vec4_dead_code_eliminate.cpp -compiler_test_vec4_dead_code_eliminate_LDADD = $(TEST_LIBS) - -# Strictly speaking this is neither a C++ test nor using gtest - we can address -# address that at a later point. Until then, this allows us a to simplify things. -compiler_test_eu_compact_SOURCES = \ - compiler/test_eu_compact.cpp -compiler_test_eu_compact_LDADD = $(TEST_LIBS) - -compiler_test_eu_validate_SOURCES = \ - compiler/test_eu_validate.cpp -compiler_test_eu_validate_LDADD = $(TEST_LIBS) diff --git a/src/intel/Makefile.dev.am b/src/intel/Makefile.dev.am deleted file mode 100644 index 2bf5b4e232a..00000000000 --- a/src/intel/Makefile.dev.am +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright © 2016 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. - -noinst_LTLIBRARIES += dev/libintel_dev.la - -dev_libintel_dev_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS) -dev_libintel_dev_la_SOURCES = $(DEV_FILES) -dev_libintel_dev_la_LIBADD = $(EXPAT_LIBS) - -if HAVE_PLATFORM_ANDROID -dev_libintel_dev_la_CFLAGS += $(ANDROID_CFLAGS) -dev_libintel_dev_la_LIBADD += $(ANDROID_LIBS) -endif diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am deleted file mode 100644 index f034f25e2ef..00000000000 --- a/src/intel/Makefile.genxml.am +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright © 2016 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. - -BUILT_SOURCES += \ - $(GENXML_GENERATED_FILES) - -EXTRA_DIST += \ - $(GENXML_XML_FILES) \ - $(GENXML_GENERATED_FILES) - -SUFFIXES = _pack.h _xml.h .xml - -$(GENXML_GENERATED_PACK_FILES): genxml/gen_pack_header.py - -.xml_pack.h: - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/genxml/gen_pack_header.py $< > $@ || ($(RM) $@; false) - -genxml/genX_xml.h: genxml/gen_zipped_file.py $(GENXML_XML_FILES) - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/genxml/gen_zipped_file.py $(GENXML_XML_FILES:%=$(srcdir)/%) > $@ || ($(RM) $@; false) - -genxml/genX_bits.h: genxml/gen_bits_header.py $(GENXML_XML_FILES) - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/genxml/gen_bits_header.py -o $@ $(GENXML_XML_FILES:%=$(srcdir)/%) - -EXTRA_DIST += \ - genxml/genX_pack.h \ - genxml/gen_macros.h \ - genxml/gen_pack_header.py \ - genxml/gen_zipped_file.py \ - genxml/gen_bits_header.py \ - genxml/README diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am deleted file mode 100644 index dcb9d3ad6fc..00000000000 --- a/src/intel/Makefile.isl.am +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 2015-2016 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. - -ISL_GEN_LIBS = \ - isl/libisl-gen4.la \ - isl/libisl-gen5.la \ - isl/libisl-gen6.la \ - isl/libisl-gen7.la \ - isl/libisl-gen75.la \ - isl/libisl-gen8.la \ - isl/libisl-gen9.la \ - isl/libisl-gen10.la \ - isl/libisl-gen11.la \ - $(NULL) - -noinst_LTLIBRARIES += $(ISL_GEN_LIBS) \ - isl/libisl.la \ - libisl_tiled_memcpy.la - -isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) \ - libisl_tiled_memcpy.la - -if SSE41_SUPPORTED -isl_libisl_la_LIBADD += libisl_tiled_memcpy_sse41.la -noinst_LTLIBRARIES += libisl_tiled_memcpy_sse41.la -endif - -isl_libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES) - -libisl_tiled_memcpy_la_SOURCES = $(ISL_TILED_MEMCPY_FILES) -libisl_tiled_memcpy_la_CFLAGS = $(AM_CFLAGS) - -libisl_tiled_memcpy_sse41_la_SOURCES = $(ISL_TILED_MEMCPY_SSE41_FILES) -libisl_tiled_memcpy_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) - -isl_tiled_memcpy_normal.c: $(ISL_TILED_MEMCPY_DEP_FILES) -isl_tiled_memcpy_sse41.c: $(ISL_TILED_MEMCPY_DEP_FILES) - -isl_libisl_gen4_la_SOURCES = $(ISL_GEN4_FILES) -isl_libisl_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40 - -isl_libisl_gen5_la_SOURCES = $(ISL_GEN5_FILES) -isl_libisl_gen5_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=50 - -isl_libisl_gen6_la_SOURCES = $(ISL_GEN6_FILES) -isl_libisl_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60 - -isl_libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES) -isl_libisl_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70 - -isl_libisl_gen75_la_SOURCES = $(ISL_GEN75_FILES) -isl_libisl_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75 - -isl_libisl_gen8_la_SOURCES = $(ISL_GEN8_FILES) -isl_libisl_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80 - -isl_libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES) -isl_libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 - -isl_libisl_gen10_la_SOURCES = $(ISL_GEN10_FILES) -isl_libisl_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100 - -isl_libisl_gen11_la_SOURCES = $(ISL_GEN11_FILES) -isl_libisl_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110 - -BUILT_SOURCES += $(ISL_GENERATED_FILES) - -isl/isl_format_layout.c: isl/gen_format_layout.py \ - isl/isl_format_layout.csv - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/isl/gen_format_layout.py \ - --csv $(srcdir)/isl/isl_format_layout.csv --out $@ - -# ---------------------------------------------------------------------------- -# Tests -# ---------------------------------------------------------------------------- - -check_PROGRAMS += isl/tests/isl_surf_get_image_offset_test - -TESTS += $(check_PROGRAMS) - -isl_tests_isl_surf_get_image_offset_test_LDADD = \ - dev/libintel_dev.la \ - isl/libisl.la \ - $(top_builddir)/src/util/libmesautil.la \ - -lm - -# ---------------------------------------------------------------------------- - -EXTRA_DIST += \ - isl/gen_format_layout.py \ - isl/isl_format_layout.csv \ - isl/README \ - $(ISL_TILED_MEMCPY_DEP_FILES) diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am deleted file mode 100644 index 4809962b188..00000000000 --- a/src/intel/Makefile.tools.am +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2015-2017 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. - -noinst_PROGRAMS += \ - tools/aubinator \ - tools/aubinator_error_decode \ - tools/i965_disasm \ - tools/error2aub - - -tools_aubinator_SOURCES = \ - tools/aub_mem.c \ - tools/aub_mem.h \ - tools/aub_read.c \ - tools/aub_read.h \ - tools/aubinator.c \ - tools/intel_aub.h - -tools_aubinator_CFLAGS = \ - $(AM_CFLAGS) \ - $(ZLIB_CFLAGS) - -tools_aubinator_LDADD = \ - common/libintel_common.la \ - compiler/libintel_compiler.la \ - dev/libintel_dev.la \ - isl/libisl.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PER_GEN_LIBS) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - $(ZLIB_LIBS) \ - -lm - - -tools_aubinator_error_decode_SOURCES = \ - tools/aubinator_error_decode.c - -tools_aubinator_error_decode_LDADD = \ - common/libintel_common.la \ - compiler/libintel_compiler.la \ - dev/libintel_dev.la \ - isl/libisl.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(ZLIB_LIBS) - -tools_aubinator_error_decode_CFLAGS = \ - $(AM_CFLAGS) \ - $(ZLIB_CFLAGS) - -tools_i965_disasm_SOURCES = \ - tools/i965_disasm.c - -tools_i965_disasm_LDADD = \ - common/libintel_common.la \ - compiler/libintel_compiler.la \ - dev/libintel_dev.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) - -tools_i965_disasm_CFLAGS = \ - $(AM_CFLAGS) - - -tools_error2aub_SOURCES = \ - tools/gen_context.h \ - tools/gen8_context.h \ - tools/gen10_context.h \ - tools/aub_write.h \ - tools/aub_write.c \ - tools/error2aub.c - -tools_error2aub_CFLAGS = \ - $(AM_CFLAGS) \ - $(ZLIB_CFLAGS) - -tools_error2aub_LDADD = \ - dev/libintel_dev.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - $(ZLIB_LIBS) \ - -lm diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am deleted file mode 100644 index 7d9a74c9301..00000000000 --- a/src/intel/Makefile.vulkan.am +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright © 2015 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. - -# Due to a what seems like a autoconf bug, we must ensure that the genaration -# rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented -# out and we'll fail at `make dist' -vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml - -vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \ - vulkan/anv_extensions.py \ - $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_entrypoints_gen.py \ - --xml $(vulkan_api_xml) \ - --outdir $(builddir)/vulkan -vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c - -vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \ - vulkan/anv_extensions.py \ - $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \ - --xml $(vulkan_api_xml) \ - --out-c $@ - -vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \ - vulkan/anv_extensions.py \ - $(vulkan_api_xml) - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \ - --xml $(vulkan_api_xml) \ - --out-h $@ - -BUILT_SOURCES += $(VULKAN_GENERATED_FILES) -CLEANFILES += \ - $(VULKAN_GENERATED_FILES) \ - vulkan/dev_icd.json \ - vulkan/intel_icd.@host_cpu@.json - -EXTRA_DIST += \ - $(top_srcdir)/include/vulkan/vk_icd.h \ - vulkan/anv_entrypoints_gen.py \ - vulkan/anv_extensions_gen.py \ - vulkan/anv_extensions.py \ - vulkan/anv_icd.py \ - vulkan/TODO - -vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \ - --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ - -vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py - $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \ - --lib-path="${libdir}" --out $@ - -if HAVE_INTEL_VULKAN - -vulkan_includedir = $(includedir)/vulkan - -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 - -vulkan_include_HEADERS = \ - $(top_srcdir)/include/vulkan/vulkan_intel.h - -lib_LTLIBRARIES += vulkan/libvulkan_intel.la - -check_LTLIBRARIES += vulkan/libvulkan-test.la - -VULKAN_PER_GEN_LIBS = \ - vulkan/libanv-gen7.la \ - vulkan/libanv-gen75.la \ - vulkan/libanv-gen8.la \ - vulkan/libanv-gen9.la \ - vulkan/libanv-gen10.la \ - vulkan/libanv-gen11.la - -noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS) - -VULKAN_CFLAGS = \ - $(AM_CFLAGS) \ - -msse2 -mstackrealign - -VULKAN_CPPFLAGS = \ - -I$(top_srcdir)/src/compiler \ - -I$(top_srcdir)/src/intel/compiler \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src/intel/vulkan \ - -I$(top_srcdir)/src/intel/vulkan \ - -I$(top_srcdir)/src/vulkan/wsi \ - -I$(top_builddir)/src/vulkan/util \ - -I$(top_srcdir)/src/vulkan/util \ - $(AM_CPPFLAGS) \ - $(LIBDRM_CFLAGS) - -vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70 -vulkan_libanv_gen7_la_SOURCES = $(VULKAN_GEN7_FILES) - -vulkan_libanv_gen75_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen75_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=75 -vulkan_libanv_gen75_la_SOURCES = $(VULKAN_GEN75_FILES) - -vulkan_libanv_gen8_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen8_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=80 -vulkan_libanv_gen8_la_SOURCES = $(VULKAN_GEN8_FILES) - -vulkan_libanv_gen9_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen9_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=90 -vulkan_libanv_gen9_la_SOURCES = $(VULKAN_GEN9_FILES) - -vulkan_libanv_gen10_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen10_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=100 -vulkan_libanv_gen10_la_SOURCES = $(VULKAN_GEN10_FILES) - -vulkan_libanv_gen11_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libanv_gen11_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=110 -vulkan_libanv_gen11_la_SOURCES = $(VULKAN_GEN11_FILES) - -VULKAN_SOURCES = \ - $(VULKAN_GENERATED_FILES) \ - $(VULKAN_FILES) - -VULKAN_LIB_DEPS = \ - vulkan/libvulkan_common.la \ - $(VULKAN_PER_GEN_LIBS) \ - compiler/libintel_compiler.la \ - common/libintel_common.la \ - dev/libintel_dev.la \ - isl/libisl.la \ - blorp/libblorp.la \ - $(top_builddir)/src/vulkan/libvulkan_util.la \ - $(top_builddir)/src/vulkan/libvulkan_wsi.la \ - $(top_builddir)/src/compiler/nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(LIBDRM_LIBS) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - -lm - -if HAVE_PLATFORM_ANDROID -VULKAN_CPPFLAGS += \ - $(ANDROID_CPPFLAGS) \ - -DVK_USE_PLATFORM_ANDROID_KHR - -VULKAN_CFLAGS += $(ANDROID_CFLAGS) -VULKAN_LIB_DEPS += $(ANDROID_LIBS) -VULKAN_SOURCES += $(VULKAN_ANDROID_FILES) -else -VULKAN_SOURCES += $(VULKAN_NON_ANDROID_FILES) -endif - -if HAVE_PLATFORM_X11 -VULKAN_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 -VULKAN_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_DRM -VULKAN_CPPFLAGS += \ - -DVK_USE_PLATFORM_DISPLAY_KHR - -VULKAN_SOURCES += $(VULKAN_WSI_DISPLAY_FILES) -endif - -if HAVE_XLIB_LEASE -VULKAN_CPPFLAGS += \ - -DVK_USE_PLATFORM_XLIB_XRANDR_EXT \ - $(XCB_RANDR_CFLAGS) \ - $(XLIB_RANDR_CFLAGS) -VULKAN_LIB_DEPS += $(XCB_RANDR_LIBS) -endif - -noinst_LTLIBRARIES += vulkan/libvulkan_common.la -vulkan_libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) -vulkan_libvulkan_common_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libvulkan_common_la_CPPFLAGS = $(VULKAN_CPPFLAGS) - -nodist_EXTRA_vulkan_libvulkan_intel_la_SOURCES = dummy.cpp -vulkan_libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) -vulkan_libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) -vulkan_libvulkan_intel_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libvulkan_intel_la_CPPFLAGS = $(VULKAN_CPPFLAGS) - -vulkan_libvulkan_intel_la_LDFLAGS = \ - -shared \ - -module \ - -no-undefined \ - -avoid-version \ - -Wl,--build-id=sha1 \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -icdconfdir = @VULKAN_ICD_INSTALL_DIR@ -icdconf_DATA = vulkan/intel_icd.@host_cpu@.json -# The following is used for development purposes, by setting VK_ICD_FILENAMES. -noinst_DATA += vulkan/dev_icd.json - -# Libvulkan with dummy gem. Used for unit tests. -vulkan_libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) -vulkan_libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) -vulkan_libvulkan_test_la_CFLAGS = $(VULKAN_CFLAGS) -vulkan_libvulkan_test_la_CPPFLAGS = $(VULKAN_CPPFLAGS) - -include $(top_srcdir)/install-lib-links.mk - -noinst_HEADERS += \ - vulkan/tests/state_pool_test_helper.h - -VULKAN_TESTS = \ - vulkan/tests/block_pool_no_free \ - vulkan/tests/state_pool_no_free \ - vulkan/tests/state_pool_free_list_only \ - vulkan/tests/state_pool_padding \ - vulkan/tests/state_pool - -VULKAN_TEST_LDADD = \ - vulkan/libvulkan-test.la \ - $(PTHREAD_LIBS) -lm -lstdc++ - -check_PROGRAMS += $(VULKAN_TESTS) -TESTS += $(VULKAN_TESTS) - -vulkan_tests_block_pool_no_free_CFLAGS = $(VULKAN_CFLAGS) -vulkan_tests_block_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS) -vulkan_tests_block_pool_no_free_LDADD = $(VULKAN_TEST_LDADD) - -vulkan_tests_state_pool_no_free_CFLAGS = $(VULKAN_CFLAGS) -vulkan_tests_state_pool_no_free_CPPFLAGS = $(VULKAN_CPPFLAGS) -vulkan_tests_state_pool_no_free_LDADD = $(VULKAN_TEST_LDADD) - -vulkan_tests_state_pool_free_list_only_CFLAGS = $(VULKAN_CFLAGS) -vulkan_tests_state_pool_free_list_only_CPPFLAGS = $(VULKAN_CPPFLAGS) -vulkan_tests_state_pool_free_list_only_LDADD = $(VULKAN_TEST_LDADD) - -vulkan_tests_state_pool_padding_CFLAGS = $(VULKAN_CFLAGS) -vulkan_tests_state_pool_padding_CPPFLAGS = $(VULKAN_CPPFLAGS) -vulkan_tests_state_pool_padding_LDADD = $(VULKAN_TEST_LDADD) - -vulkan_tests_state_pool_CFLAGS = $(VULKAN_CFLAGS) -vulkan_tests_state_pool_CPPFLAGS = $(VULKAN_CPPFLAGS) -vulkan_tests_state_pool_LDADD = $(VULKAN_TEST_LDADD) - -endif diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am deleted file mode 100644 index fbefdaee5da..00000000000 --- a/src/loader/Makefile.am +++ /dev/null @@ -1,57 +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 Makefile.sources - -EXTRA_DIST = SConscript meson.build - -noinst_LTLIBRARIES = libloader.la - -AM_CPPFLAGS = \ - -I$(top_builddir)/src/util/ \ - -DUSE_DRICONF \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - $(VISIBILITY_CFLAGS) \ - $(XCB_DRI3_CFLAGS) \ - $(LIBDRM_CFLAGS) - -libloader_la_CPPFLAGS = $(AM_CPPFLAGS) -libloader_la_SOURCES = $(LOADER_C_FILES) -libloader_la_LIBADD = - -if HAVE_LIBDRM -libloader_la_LIBADD += \ - $(LIBDRM_LIBS) -endif - -if HAVE_PLATFORM_X11 -if HAVE_DRI3 -noinst_LTLIBRARIES += libloader_dri3_helper.la - -libloader_dri3_helper_la_SOURCES = \ - loader_dri3_helper.c \ - loader_dri3_helper.h -libloader_dri3_helper_la_LIBADD = $(XCB_DRI3_LIBS) -endif -endif diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am deleted file mode 100644 index 23735ded1a5..00000000000 --- a/src/mapi/Makefile.am +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright © 2013, 2014 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. - -SUBDIRS = -TESTS = - -BUILT_SOURCES = -CLEANFILES = $(BUILT_SOURCES) - -lib_LTLIBRARIES = -check_PROGRAMS = -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = - -EXTRA_DIST = \ - new/genCommon.py \ - new/gen_gldispatch_mapi.py \ - es1api/ABI-check \ - es2api/ABI-check \ - mapi_abi.py \ - glapi/SConscript \ - glapi/registry/gl.xml \ - shared-glapi/SConscript \ - es1api/meson.build \ - es2api/meson.build \ - glapi/meson.build \ - shared-glapi/meson.build \ - meson.build - -AM_CFLAGS = \ - $(PTHREAD_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) -AM_CPPFLAGS = \ - $(DEFINES) \ - $(SELINUX_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src/mapi \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi - -include Makefile.sources - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -shared_glapi_gen_mapi_deps := \ - mapi_abi.py \ - $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ - $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) - -glapi_gen_gl_xml := \ - $(srcdir)/glapi/registry/gl.xml -glapi_gen_mapi_script = $(srcdir)/new/gen_gldispatch_mapi.py -glapi_gen_mapi_deps = \ - $(glapi_gen_mapi_script) \ - $(srcdir)/new/genCommon.py \ - $(glapi_gen_gl_xml) -glapi_gen_mapi = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) - -if HAVE_SHARED_GLAPI -BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h - -lib_LTLIBRARIES += shared-glapi/libglapi.la -shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h -shared_glapi_libglapi_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -shared_glapi_libglapi_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DMAPI_MODE_GLAPI \ - -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\" -shared_glapi_libglapi_la_LIBADD = \ - $(PTHREAD_LIBS) \ - $(SELINUX_LIBS) -shared_glapi_libglapi_la_LDFLAGS = \ - -no-undefined \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -TESTS += shared-glapi-test -check_PROGRAMS += shared-glapi-test - -shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp -shared_glapi_test_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src/mesa -shared_glapi_test_LDADD = \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(top_builddir)/src/gtest/libgtest.la -endif - -shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(shared_glapi_gen_mapi_deps) - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer shared-glapi \ - $(srcdir)/glapi/gen/gl_and_es_API.xml > $@ - -if HAVE_OPENGL -noinst_LTLIBRARIES = glapi/libglapi.la - -if HAVE_X86_ASM -if HAVE_X86_64_ASM -GLAPI_ASM_SOURCES = glapi/glapi_x86-64.S -else -GLAPI_ASM_SOURCES = glapi/glapi_x86.S -endif -endif -if HAVE_SPARC_ASM -GLAPI_ASM_SOURCES = glapi/glapi_sparc.S -endif - -glapi_libglapi_la_SOURCES = -glapi_libglapi_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/mesa - -if HAVE_APPLEDRI -glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c -endif -if HAVE_WINDOWSDRI -glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c -endif - -if HAVE_SHARED_GLAPI -glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h -glapi_libglapi_la_CPPFLAGS += \ - -DMAPI_MODE_BRIDGE \ - -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" -else -glapi_libglapi_la_CPPFLAGS += \ - -DMAPI_MODE_UTIL -glapi_libglapi_la_SOURCES += \ - glapi/glapi_dispatch.c \ - glapi/glapi_entrypoint.c \ - glapi/glapi_getproc.c \ - glapi/glapi_nop.c \ - glapi/glapi.c \ - glapi/glapi.h \ - glapi/glapi_priv.h \ - $(GLAPI_ASM_SOURCES) \ - $(MAPI_UTIL_FILES) - -TESTS += glapi-test -check_PROGRAMS += glapi-test - -glapi_test_SOURCES = glapi/tests/check_table.cpp -glapi_test_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src/mesa - -glapi_test_LDADD = \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(top_builddir)/src/gtest/libgtest.la -endif -endif - -if USE_LIBGLVND -else -if HAVE_OPENGL_ES1 -TESTS += es1api/ABI-check - -BUILT_SOURCES += es1api/glapi_mapi_tmp.h - -pkgconfig_DATA += es1api/glesv1_cm.pc - -GLES_includedir = $(includedir)/GLES -GLES_include_HEADERS = \ - $(top_srcdir)/include/GLES/egl.h \ - $(top_srcdir)/include/GLES/gl.h \ - $(top_srcdir)/include/GLES/glext.h \ - $(top_srcdir)/include/GLES/glplatform.h - -lib_LTLIBRARIES += es1api/libGLESv1_CM@GLES_LIB_SUFFIX@.la - -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DMAPI_MODE_BRIDGE \ - -DMAPI_ABI_HEADER=\"es1api/glapi_mapi_tmp.h\" -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LIBADD = $(GLESv1_CM_LIB_DEPS) -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LDFLAGS = \ - -no-undefined \ - -version-number 1:1 \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -es1api_libGLESv1_CM@GLES_LIB_SUFFIX@_la_LIBADD += shared-glapi/libglapi.la -endif # HAVE_OPENGL_ES1 -endif # USE_LIBGLVND - -es1api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps) - $(MKDIR_GEN) - $(glapi_gen_mapi) glesv1 $(glapi_gen_gl_xml) > $@ - -if USE_LIBGLVND -else -if HAVE_OPENGL_ES2 -TESTS += es2api/ABI-check - -BUILT_SOURCES += es2api/glapi_mapi_tmp.h - -pkgconfig_DATA += es2api/glesv2.pc - -GLES2_includedir = $(includedir)/GLES2 -GLES2_include_HEADERS = \ - $(top_srcdir)/include/GLES2/gl2.h \ - $(top_srcdir)/include/GLES2/gl2ext.h \ - $(top_srcdir)/include/GLES2/gl2platform.h -GLES3_includedir = $(includedir)/GLES3 -GLES3_include_HEADERS = \ - $(top_srcdir)/include/GLES3/gl3.h \ - $(top_srcdir)/include/GLES3/gl31.h \ - $(top_srcdir)/include/GLES3/gl32.h \ - $(top_srcdir)/include/GLES3/gl3ext.h \ - $(top_srcdir)/include/GLES3/gl3platform.h - -lib_LTLIBRARIES += es2api/libGLESv2@GLES_LIB_SUFFIX@.la - -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DMAPI_MODE_BRIDGE \ - -DMAPI_ABI_HEADER=\"es2api/glapi_mapi_tmp.h\" -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LIBADD = $(GLESv2_LIB_DEPS) -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LDFLAGS = \ - -no-undefined \ - -version-number 2 \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -es2api_libGLESv2@GLES_LIB_SUFFIX@_la_LIBADD += shared-glapi/libglapi.la -endif # HAVE_OPENGL_ES2 -endif # USE_LIBGLVND - -es2api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps) - $(MKDIR_GEN) - $(glapi_gen_mapi) glesv2 $(glapi_gen_gl_xml) > $@ - -include $(top_srcdir)/install-lib-links.mk - -if NEED_KHRPLATFORM -khrdir = $(includedir)/KHR -khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h -endif diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am deleted file mode 100644 index 40538b0ff2e..00000000000 --- a/src/mapi/glapi/gen/Makefile.am +++ /dev/null @@ -1,373 +0,0 @@ -# These are the "official" xserver indent flags from utils/modular/x-indent.sh -XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -psl -nbbo \ - -nbc -psl -nbfda -nut -nss -T pointer -T ScreenPtr -T ScrnInfoPtr -T pointer \ - -T DeviceIntPtr -T DevicePtr -T ClientPtr -T CallbackListPtr \ - -T CallbackProcPtr -T OsTimerPtr -T CARD32 -T CARD16 -T CARD8 \ - -T INT32 -T INT16 -T INT8 -T Atom -T Time -T WindowPtr -T DrawablePtr \ - -T PixmapPtr -T ColormapPtr -T CursorPtr -T Font -T XID -T Mask \ - -T BlockHandlerProcPtr -T WakeupHandlerProcPtr -T RegionPtr \ - -T InternalEvent -T GrabPtr -T Timestamp -T Bool -T TimeStamp \ - -T xEvent -T DeviceEvent -T RawDeviceEvent -T GrabMask -T Window \ - -T Drawable -T FontPtr -T CallbackPtr -T XIPropertyValuePtr \ - -T GrabParameters -T deviceKeyButtonPointer -T TouchOwnershipEvent \ - -T xGenericEvent -T DeviceChangedEvent -T GCPtr -T BITS32 \ - -T xRectangle -T BoxPtr -T RegionRec -T ValuatorMask -T KeyCode \ - -T KeySymsPtr -T XkbDescPtr -T InputOption -T XI2Mask -T DevUnion \ - -T DevPrivateKey -T DevScreenPrivateKey -T PropertyPtr -T RESTYPE \ - -T XkbAction -T XkbChangesPtr -T XkbControlsPtr -T PrivatePtr -T pmWait \ - -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT - - -MESA_DIR = $(top_builddir)/src/mesa -MESA_GLAPI_DIR = $(top_builddir)/src/mapi/glapi -MESA_MAPI_DIR = $(top_srcdir)/src/mapi -MESA_GLX_DIR = $(top_builddir)/src/glx - -MESA_GLAPI_OUTPUTS = \ - $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \ - $(MESA_GLAPI_DIR)/glprocs.h \ - $(MESA_GLAPI_DIR)/glapitemp.h \ - $(MESA_GLAPI_DIR)/glapitable.h - -if HAVE_APPLEDRI -MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c -endif -if HAVE_WINDOWSDRI -MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c -endif - -MESA_GLAPI_ASM_OUTPUTS = -if HAVE_X86_ASM -if HAVE_X86_64_ASM -MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S -else -MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S -endif -endif - -if HAVE_SPARC_ASM -MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S -endif - -BUILT_SOURCES = \ - $(MESA_GLAPI_OUTPUTS) \ - $(MESA_GLAPI_ASM_OUTPUTS) \ - $(MESA_DIR)/main/enums.c \ - $(MESA_DIR)/main/api_exec.c \ - $(MESA_DIR)/main/marshal_generated.c \ - $(MESA_DIR)/main/marshal_generated.h \ - $(MESA_DIR)/main/dispatch.h \ - $(MESA_DIR)/main/remap_helper.h \ - $(MESA_GLX_DIR)/indirect.c \ - $(MESA_GLX_DIR)/indirect.h \ - $(MESA_GLX_DIR)/indirect_init.c \ - $(MESA_GLX_DIR)/indirect_size.h \ - $(MESA_GLX_DIR)/indirect_size.c -EXTRA_DIST= \ - $(BUILT_SOURCES) \ - $(MESA_GLAPI_DIR)/glapi_gentable.c \ - $(MESA_GLAPI_DIR)/glapi_x86.S \ - $(MESA_GLAPI_DIR)/glapi_x86-64.S \ - $(MESA_GLAPI_DIR)/glapi_sparc.S \ - $(COMMON_GLX) \ - apiexec.py \ - gl_apitemp.py \ - gl_enums.py \ - gl_genexec.py \ - gl_gentable.py \ - gl_marshal.py \ - gl_marshal_h.py \ - gl_procs.py \ - gl_SPARC_asm.py \ - gl_table.py \ - gl_x86-64_asm.py \ - gl_x86_asm.py \ - glX_proto_recv.py \ - glX_proto_send.py \ - glX_proto_size.py \ - glX_server_table.py \ - marshal_XML.py \ - remap_helper.py \ - static_data.py \ - SConscript \ - gl_API.dtd \ - meson.build - -###################################################################### - -XORG_GLX_DIR = $(XORG_BASE)/glx -XORG_GLAPI_DIR = $(XORG_BASE)/glx - -XORG_OUTPUTS = \ - $(XORG_GLX_DIR)/indirect_dispatch.c \ - $(XORG_GLX_DIR)/indirect_dispatch_swap.c \ - $(XORG_GLX_DIR)/indirect_dispatch.h \ - $(XORG_GLX_DIR)/indirect_reqsize.c \ - $(XORG_GLX_DIR)/indirect_reqsize.h \ - $(XORG_GLX_DIR)/indirect_size.h \ - $(XORG_GLX_DIR)/indirect_size_get.c \ - $(XORG_GLX_DIR)/indirect_size_get.h \ - $(XORG_GLX_DIR)/indirect_table.c - -.PHONY: $(XORG_OUTPUTS) - -###################################################################### - -API_XML = \ - gl_API.xml \ - es_EXT.xml \ - gl_and_es_API.xml \ - gl_and_glX_API.xml \ - ARB_base_instance.xml \ - ARB_blend_func_extended.xml \ - ARB_bindless_texture.xml \ - ARB_clear_buffer_object.xml \ - ARB_clear_texture.xml \ - ARB_clip_control.xml \ - ARB_color_buffer_float.xml \ - ARB_compressed_texture_pixel_storage.xml \ - ARB_compute_shader.xml \ - ARB_compute_variable_group_size.xml \ - ARB_copy_buffer.xml \ - ARB_copy_image.xml \ - ARB_debug_output.xml \ - ARB_depth_buffer_float.xml \ - ARB_depth_clamp.xml \ - ARB_direct_state_access.xml \ - ARB_draw_buffers.xml \ - ARB_draw_buffers_blend.xml \ - ARB_draw_elements_base_vertex.xml \ - ARB_draw_indirect.xml \ - ARB_draw_instanced.xml \ - ARB_ES2_compatibility.xml \ - ARB_ES3_compatibility.xml \ - ARB_framebuffer_no_attachments.xml \ - ARB_framebuffer_object.xml \ - ARB_get_program_binary.xml \ - ARB_get_texture_sub_image.xml \ - ARB_gl_spirv.xml \ - ARB_gpu_shader_fp64.xml \ - ARB_gpu_shader_int64.xml \ - ARB_gpu_shader5.xml \ - ARB_indirect_parameters.xml \ - ARB_instanced_arrays.xml \ - ARB_internalformat_query.xml \ - ARB_internalformat_query2.xml \ - ARB_invalidate_subdata.xml \ - ARB_map_buffer_range.xml \ - ARB_multi_bind.xml \ - ARB_pipeline_statistics_query.xml \ - ARB_program_interface_query.xml \ - ARB_robustness.xml \ - ARB_sample_shading.xml \ - ARB_sampler_objects.xml \ - ARB_seamless_cube_map.xml \ - ARB_separate_shader_objects.xml \ - ARB_shader_atomic_counters.xml \ - ARB_shader_image_load_store.xml \ - ARB_shader_subroutine.xml \ - ARB_shader_storage_buffer_object.xml \ - ARB_sparse_buffer.xml \ - ARB_sync.xml \ - ARB_tessellation_shader.xml \ - ARB_texture_barrier.xml \ - ARB_texture_buffer_object.xml \ - ARB_texture_buffer_range.xml \ - ARB_texture_compression_rgtc.xml \ - ARB_texture_cube_map_array.xml \ - ARB_texture_float.xml \ - ARB_texture_gather.xml \ - ARB_texture_multisample.xml \ - ARB_texture_rgb10_a2ui.xml \ - ARB_texture_rg.xml \ - ARB_texture_storage_multisample.xml \ - ARB_texture_storage.xml \ - ARB_texture_view.xml \ - ARB_uniform_buffer_object.xml \ - ARB_vertex_array_object.xml \ - ARB_vertex_attrib_64bit.xml \ - ARB_vertex_attrib_binding.xml \ - ARB_viewport_array.xml \ - AMD_depth_clamp_separate.xml \ - AMD_draw_buffers_blend.xml \ - AMD_gpu_shader_int64.xml \ - AMD_performance_monitor.xml \ - ARB_vertex_type_2_10_10_10_rev.xml \ - APPLE_object_purgeable.xml \ - APPLE_vertex_array_object.xml \ - EXT_draw_buffers2.xml \ - EXT_external_objects.xml \ - EXT_external_objects_fd.xml \ - EXT_framebuffer_object.xml \ - EXT_gpu_shader4.xml \ - EXT_multisampled_render_to_texture.xml \ - EXT_packed_depth_stencil.xml \ - EXT_provoking_vertex.xml \ - EXT_separate_shader_objects.xml \ - EXT_texture_array.xml \ - EXT_texture_integer.xml \ - EXT_transform_feedback.xml \ - EXT_vertex_attrib_64bit.xml \ - EXT_window_rectangles.xml \ - GREMEDY_string_marker.xml \ - INTEL_performance_query.xml \ - KHR_debug.xml \ - KHR_context_flush_control.xml \ - KHR_robustness.xml \ - KHR_robustness_es.xml \ - KHR_texture_compression_astc.xml \ - MESA_tile_raster_order.xml \ - NV_conditional_render.xml \ - NV_primitive_restart.xml \ - NV_texture_barrier.xml \ - NV_vdpau_interop.xml \ - OES_EGL_image.xml \ - OES_fixed_point.xml \ - OES_single_precision.xml \ - OES_texture_compression_astc.xml \ - GL3x.xml \ - GL4x.xml - -COMMON = $(API_XML) \ - gl_XML.py \ - glX_XML.py \ - license.py \ - static_data.py \ - typeexpr.py - -COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -###################################################################### - -xorg: check-xorg-source $(XORG_OUTPUTS) - -check-xorg-source: - @if ! test -d $(XORG_GLX_DIR); then \ - echo "ERROR: Must specify path to xserver/ checkout. Set XORG_BASE env var."; \ - if test x$(XORG_BASE) != x; then \ - echo "'$(XORG_GLX_DIR)' does not exist."; \ - fi; \ - exit 1; \ - fi - -clean-local: - -rm -f *~ *.pyo - -###################################################################### - -$(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c - $(INDENT) $(XORG_INDENT_FLAGS) < $< > $@ - -$(XORG_GLAPI_DIR)/dispatch.h: $(MESA_DIR)/main/dispatch.h - $(INDENT) $(XORG_INDENT_FLAGS) < $< > $@ - -$(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h - $(INDENT) $(XORG_INDENT_FLAGS) < $< > $@ - -###################################################################### - -$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON) - $(PYTHON_GEN) $(MESA_MAPI_DIR)/mapi_abi.py \ - --printer glapi $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_procs.py -c -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_apitemp.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_gentable.py -f $(srcdir)/gl_and_es_API.xml > $@ - -###################################################################### - -$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_x86_asm.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_x86-64_asm.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_SPARC_asm.py -f $(srcdir)/gl_and_es_API.xml > $@ - -###################################################################### - -$(MESA_DIR)/main/enums.c: gl_enums.py $(srcdir)/../registry/gl.xml - $(PYTHON_GEN) $(srcdir)/gl_enums.py -f $(srcdir)/../registry/gl.xml > $@ - -$(MESA_DIR)/main/api_exec.c: gl_genexec.py apiexec.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_genexec.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_DIR)/main/marshal_generated.c: gl_marshal.py marshal_XML.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_marshal.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_DIR)/main/marshal_generated.h: gl_marshal_h.py marshal_XML.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_marshal_h.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@ - -$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/remap_helper.py -f $(srcdir)/gl_and_es_API.xml > $@ - -###################################################################### - -$(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m proto \ - | $(INDENT) $(INDENT_FLAGS) > $@ - -$(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m init_h > $@ - -$(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX) - $(PYTHON_GEN) $(srcdir)/glX_proto_send.py -f $(srcdir)/gl_API.xml -m init_c > $@ - -$(MESA_GLX_DIR)/indirect_size.h $(XORG_GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $(srcdir)/glX_proto_size.py -f $(srcdir)/gl_API.xml -m size_h --only-set \ - --header-tag _INDIRECT_SIZE_H_ \ - | $(INDENT) $(INDENT_FLAGS) > $@ - -$(MESA_GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $(srcdir)/glX_proto_size.py -f $(srcdir)/gl_API.xml -m size_c --only-set \ - | $(INDENT) $(INDENT_FLAGS) > $@ - -###################################################################### - -$(XORG_GLX_DIR)/indirect_dispatch.c: glX_proto_recv.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m dispatch_c -s \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX) - $(PYTHON_GEN) $< -m dispatch_h -f $(srcdir)/gl_and_glX_API.xml -s \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \ - --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_c \ - | $(INDENT) $(INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \ - --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_c \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ - -$(XORG_GLX_DIR)/indirect_table.c: glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX) - $(PYTHON_GEN) $< -f $(srcdir)/gl_and_glX_API.xml \ - | $(INDENT) $(XORG_INDENT_FLAGS) > $@ diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am deleted file mode 100644 index d7daa995c5c..00000000000 --- a/src/mesa/Makefile.am +++ /dev/null @@ -1,198 +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. - -SUBDIRS = . main/tests - -# state tracker tests depend on libmesagallium.la -if HAVE_GALLIUM -SUBDIRS += state_tracker/tests -endif - -if HAVE_XLIB_GLX -SUBDIRS += drivers/x11 -endif - -if HAVE_DRICOMMON -SUBDIRS += drivers/dri -endif - -if HAVE_OSMESA -SUBDIRS += drivers/osmesa -endif - -include Makefile.sources - -EXTRA_DIST = \ - drivers/SConscript \ - main/meson.build \ - program/meson.build \ - meson.build \ - main/format_fallback.py \ - main/format_info.py \ - main/format_pack.py \ - main/format_parser.py \ - main/format_unpack.py \ - main/formats.csv \ - main/get_hash_generator.py \ - main/get_hash_params.py \ - program/program_lexer.l \ - program/program_parse.y \ - SConscript \ - swrast/NOTES \ - swrast_setup/NOTES \ - tnl/NOTES \ - tnl_dd - -BUILT_SOURCES = \ - main/get_hash.h \ - main/format_fallback.c \ - main/format_info.h \ - main/format_pack.c \ - main/format_unpack.c \ - program/program_parse.tab.c \ - program/lex.yy.c -CLEANFILES = \ - $(BUILT_SOURCES) \ - program/program_parse.tab.h - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \ - main/get_hash_generator.py - $(PYTHON_GEN) $(srcdir)/main/get_hash_generator.py \ - -f $(srcdir)/../mapi/glapi/gen/gl_and_es_API.xml > $@ - -main/format_fallback.c: main/format_fallback.py \ - main/format_parser.py \ - main/formats.csv - $(PYTHON_GEN) $(srcdir)/main/format_fallback.py $(srcdir)/main/formats.csv $@ - -main/format_info.h: main/formats.csv \ - main/format_parser.py main/format_info.py - $(PYTHON_GEN) $(srcdir)/main/format_info.py $(srcdir)/main/formats.csv > $@ - -main/format_pack.c: main/format_pack.py main/formats.csv \ - main/format_parser.py - $(PYTHON_GEN) $(srcdir)/main/format_pack.py $(srcdir)/main/formats.csv > $@ - -main/format_unpack.c: main/format_unpack.py main/formats.csv \ - main/format_parser.py - $(PYTHON_GEN) $(srcdir)/main/format_unpack.py $(srcdir)/main/formats.csv > $@ - -main/formats.c: main/format_info.h - -noinst_LTLIBRARIES = $(ARCH_LIBS) -if NEED_LIBMESA -noinst_LTLIBRARIES += libmesa.la -else -check_LTLIBRARIES = libmesa.la -endif -if HAVE_GALLIUM -noinst_LTLIBRARIES += libmesagallium.la -endif - -AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS) -AM_CFLAGS = \ - $(VDPAU_CFLAGS) \ - $(LLVM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) -AM_CXXFLAGS = \ - $(LLVM_CFLAGS) \ - $(VISIBILITY_CXXFLAGS) \ - $(MSVC2013_COMPAT_CXXFLAGS) - -ARCH_LIBS = - -if SSE41_SUPPORTED -ARCH_LIBS += libmesa_sse41.la -endif - -MESA_ASM_FILES_FOR_ARCH = - -if HAVE_X86_ASM -noinst_PROGRAMS = gen_matypes - -gen_matypes_SOURCES = x86/gen_matypes.c -BUILT_SOURCES += matypes.h - -if HAVE_X86_64_ASM -MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES) -AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64 -else -MESA_ASM_FILES_FOR_ARCH += $(X86_FILES) -AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86 -endif -endif -if HAVE_SPARC_ASM -MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES) -AM_CPPFLAGS += -I$(builddir)/sparc -I$(srcdir)/sparc -endif - -libmesa_la_SOURCES = \ - $(MESA_FILES) \ - $(PROGRAM_FILES) \ - $(PROGRAM_NIR_FILES) \ - $(MESA_ASM_FILES_FOR_ARCH) - -libmesa_la_LIBADD = \ - $(top_builddir)/src/compiler/glsl/libglsl.la \ - $(ARCH_LIBS) - -libmesagallium_la_SOURCES = \ - $(MESA_GALLIUM_FILES) \ - $(PROGRAM_FILES) \ - $(PROGRAM_NIR_FILES) \ - $(MESA_ASM_FILES_FOR_ARCH) - -libmesagallium_la_LIBADD = \ - $(top_builddir)/src/compiler/glsl/libglsl.la \ - $(ARCH_LIBS) - -libmesa_sse41_la_SOURCES = \ - $(X86_SSE41_FILES) - -libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS) -LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS) - -program/lex.yy.c: program/program_lexer.l - $(MKDIR_GEN) - $(LEX_GEN) -o $@ $(srcdir)/program/program_lexer.l - -program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y - $(MKDIR_GEN) - $(YACC_GEN) -o $@ -p "_mesa_program_" --defines=$(builddir)/program/program_parse.tab.h $(srcdir)/program/program_parse.y - -if GEN_ASM_OFFSETS -matypes.h: $(gen_matypes_SOURCES) - $(AM_V_GEN)$(COMPILE) $< -DASM_OFFSETS -S -o - | \ - sed -n '/^->/{s:^->::;/[$$]/{s:^:#define :;s:[$$]::};p}' > $@ -else -matypes.h: gen_matypes - $(AM_V_GEN)./gen_matypes > $@ -endif - -# Emacs tags -tags: - etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am deleted file mode 100644 index 3876d7c4192..00000000000 --- a/src/mesa/drivers/dri/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ -dridir = $(DRI_DRIVER_INSTALL_DIR) - -SUBDIRS = -MEGADRIVERS = -MEGADRIVERS_DEPS = - -SUBDIRS+=common - -if HAVE_I915_DRI -SUBDIRS += i915 -MEGADRIVERS_DEPS += i915/libi915_dri.la -MEGADRIVERS += i915_dri.so -endif - -if HAVE_I965_DRI -SUBDIRS += i965 -MEGADRIVERS_DEPS += i965/libi965_dri.la -MEGADRIVERS += i965_dri.so -endif - -if HAVE_NOUVEAU_DRI -SUBDIRS += nouveau -MEGADRIVERS_DEPS += nouveau/libnouveau_dri.la -MEGADRIVERS += nouveau_vieux_dri.so -endif - -if HAVE_R200_DRI -SUBDIRS += r200 -MEGADRIVERS_DEPS += r200/libr200_dri.la -MEGADRIVERS += r200_dri.so -endif - -if HAVE_RADEON_DRI -SUBDIRS += radeon -MEGADRIVERS_DEPS += radeon/libradeon_dri.la -MEGADRIVERS += radeon_dri.so -endif - -if HAVE_SWRAST_DRI -SUBDIRS += swrast -MEGADRIVERS_DEPS += swrast/libswrast_dri.la -MEGADRIVERS += swrast_dri.so -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dri.pc - -driincludedir = $(includedir)/GL/internal -driinclude_HEADERS = \ - $(top_srcdir)/include/GL/internal/dri_interface.h - -nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp -mesa_dri_drivers_la_SOURCES = -mesa_dri_drivers_la_LDFLAGS = \ - -shared \ - -shrext .so \ - -module \ - -no-undefined \ - -avoid-version \ - $(LD_BUILD_ID) \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -mesa_dri_drivers_la_LIBADD = \ - ../../libmesa.la \ - common/libmegadriver_stub.la \ - common/libdricommon.la \ - $(top_builddir)/src/util/libxmlconfig.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(MEGADRIVERS_DEPS) \ - $(DRI_LIB_DEPS) \ - $() - -EXTRA_DIST = meson.build - -if NEED_MEGADRIVER -dri_LTLIBRARIES = mesa_dri_drivers.la - -if HAVE_COMPAT_SYMLINKS -# Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree. -all-local: mesa_dri_drivers.la - $(AM_V_at)$(MKDIR_P) $(top_builddir)/$(LIB_DIR); - $(AM_V_GEN)ln -f .libs/mesa_dri_drivers.so \ - $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so; - $(AM_V_GEN)for i in $(MEGADRIVERS); do \ - ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \ - $(top_builddir)/$(LIB_DIR)/$$i; \ - done; - -clean-local: - $(AM_V_GEN)$(RM) $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so; - $(AM_V_GEN)for i in $(MEGADRIVERS); do \ - $(RM) $(top_builddir)/$(LIB_DIR)/$$i; \ - done; -endif - -# hardlink each megadriver instance, but don't actually have -# mesa_dri_drivers.so in the set of final installed files. -install-data-hook: - for i in $(MEGADRIVERS); do \ - ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ - $(DESTDIR)$(dridir)/$$i; \ - done; - $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.* - -uninstall-hook: - for i in $(MEGADRIVERS); do \ - $(RM) $(DESTDIR)$(dridir)/$$i; \ - done; - -endif diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am deleted file mode 100644 index 192b3642b21..00000000000 --- a/src/mesa/drivers/dri/common/Makefile.am +++ /dev/null @@ -1,44 +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 Makefile.sources - -EXTRA_DIST = SConscript meson.build - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util/ \ - $(LIBDRM_CFLAGS) \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) - -noinst_LTLIBRARIES = \ - libdricommon.la \ - libmegadriver_stub.la - -libdricommon_la_SOURCES = $(DRI_COMMON_FILES) - -libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am deleted file mode 100644 index b66617ba82f..00000000000 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ - - -# Copyright © 2012 Matt Turner <mattst88@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. - -include Makefile.sources - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(I915_CFLAGS) - -noinst_LTLIBRARIES = libi915_dri.la -libi915_dri_la_SOURCES = $(i915_FILES) -libi915_dri_la_LIBADD = $(I915_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am deleted file mode 100644 index d7d7db208da..00000000000 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ /dev/null @@ -1,126 +0,0 @@ - - -# Copyright © 2011 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 Makefile.sources - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_builddir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_builddir)/src/compiler \ - -I$(top_srcdir)/src/compiler \ - -I$(top_builddir)/src/compiler/glsl \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir \ - -I$(top_builddir)/src/intel \ - -I$(top_srcdir)/src/intel \ - -I$(top_srcdir)/include \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(WNO_OVERRIDE_INIT) \ - $(LIBDRM_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - -msse2 -mstackrealign - -AM_CXXFLAGS = $(AM_CFLAGS) - -I965_PERGEN_LIBS = \ - libi965_gen4.la \ - libi965_gen45.la \ - libi965_gen5.la \ - libi965_gen6.la \ - libi965_gen7.la \ - libi965_gen75.la \ - libi965_gen8.la \ - libi965_gen9.la \ - libi965_gen10.la \ - libi965_gen11.la - -libi965_gen4_la_SOURCES = $(i965_gen4_FILES) -libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40 - -libi965_gen45_la_SOURCES = $(i965_gen45_FILES) -libi965_gen45_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=45 - -libi965_gen5_la_SOURCES = $(i965_gen5_FILES) -libi965_gen5_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=50 - -libi965_gen6_la_SOURCES = $(i965_gen6_FILES) -libi965_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60 - -libi965_gen7_la_SOURCES = $(i965_gen7_FILES) -libi965_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70 - -libi965_gen75_la_SOURCES = $(i965_gen75_FILES) -libi965_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75 - -libi965_gen8_la_SOURCES = $(i965_gen8_FILES) -libi965_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80 - -libi965_gen9_la_SOURCES = $(i965_gen9_FILES) -libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 - -libi965_gen10_la_SOURCES = $(i965_gen10_FILES) -libi965_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100 - -libi965_gen11_la_SOURCES = $(i965_gen11_FILES) -libi965_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110 - -noinst_LTLIBRARIES = \ - libi965_dri.la \ - $(I965_PERGEN_LIBS) - -libi965_dri_la_SOURCES = \ - $(i965_FILES) \ - $(i965_oa_GENERATED_FILES) -libi965_dri_la_LIBADD = \ - $(top_builddir)/src/intel/common/libintel_common.la \ - $(top_builddir)/src/intel/dev/libintel_dev.la \ - $(top_builddir)/src/intel/isl/libisl.la \ - $(top_builddir)/src/intel/compiler/libintel_compiler.la \ - $(top_builddir)/src/intel/blorp/libblorp.la \ - $(I965_PERGEN_LIBS) \ - $(LIBDRM_LIBS) - -BUILT_SOURCES = $(i965_oa_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - brw_oa.py \ - $(i965_oa_xml_FILES) \ - meson.build - -brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES) - $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \ - --code=$(builddir)/brw_oa_metrics.c \ - --header=$(builddir)/brw_oa_metrics.h \ - $(i965_oa_xml_FILES:%=$(srcdir)/%) - -brw_oa_metrics.h: brw_oa_metrics.c diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am deleted file mode 100644 index 59fd7fce7c9..00000000000 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ - - -# Copyright © 2012 Matt Turner <mattst88@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. - -include Makefile.sources - -EXTRA_DIST = \ - nouveau_render_t.c \ - nouveau_swtnl_t.c \ - nouveau_vbo_t.c \ - meson.build - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(NVVIEUX_CFLAGS) - -noinst_LTLIBRARIES = libnouveau_dri.la -libnouveau_dri_la_SOURCES = $(NOUVEAU_C_FILES) -libnouveau_dri_la_LIBADD = $(NVVIEUX_LIBS) diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am deleted file mode 100644 index 3d15c019909..00000000000 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ - - -# Copyright © 2012 Matt Turner <mattst88@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. - -include Makefile.sources - -EXTRA_DIST = \ - r200_maos_arrays.c \ - meson.build - -AM_CFLAGS = \ - -DRADEON_R200 \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(RADEON_CFLAGS) - -noinst_LTLIBRARIES = libr200_dri.la -libr200_dri_la_SOURCES = $(R200_C_FILES) -libr200_dri_la_LIBADD = $(RADEON_LIBS) diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am deleted file mode 100644 index 9d43d2627fa..00000000000 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ - - -# Copyright © 2012 Matt Turner <mattst88@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. - -include Makefile.sources - -EXTRA_DIST = \ - radeon_maos_verts.c \ - radeon_maos_arrays.c \ - meson.build - -AM_CFLAGS = \ - -DRADEON_R100 \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) \ - $(RADEON_CFLAGS) - -noinst_LTLIBRARIES = libradeon_dri.la -libradeon_dri_la_SOURCES = $(RADEON_C_FILES) -libradeon_dri_la_LIBADD = $(RADEON_LIBS) diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am deleted file mode 100644 index 110c056054b..00000000000 --- a/src/mesa/drivers/dri/swrast/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ - - -# Copyright © 2012 Matt Turner <mattst88@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. - -include Makefile.sources - -AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa/ \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/util \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - $(LIBDRM_CFLAGS) \ - $(DEFINES) \ - $(VISIBILITY_CFLAGS) - -noinst_LTLIBRARIES = libswrast_dri.la -libswrast_dri_la_SOURCES = $(SWRAST_C_FILES) - -EXTRA_DIST = meson.build diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am deleted file mode 100644 index f7816995933..00000000000 --- a/src/mesa/drivers/osmesa/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ - - -# Copyright © 2012 Laurent Carlier <lordheavym@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. - -EXTRA_DIST = osmesa.def SConscript meson.build - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/mapi \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mesa/ \ - $(DEFINES) -AM_CFLAGS = $(PTHREAD_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -lib_LTLIBRARIES = lib@OSMESA_LIB@.la - -nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp -lib@OSMESA_LIB@_la_SOURCES = osmesa.c - -lib@OSMESA_LIB@_la_LDFLAGS = \ - -no-undefined \ - -version-number @OSMESA_VERSION@ \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - - -if HAVE_SHARED_GLAPI -SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -endif - -lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(SHARED_GLAPI_LIB) \ - $(OSMESA_LIB_DEPS) - -include $(top_srcdir)/install-lib-links.mk - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = osmesa.pc diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am deleted file mode 100644 index 3024c549e61..00000000000 --- a/src/mesa/drivers/x11/Makefile.am +++ /dev/null @@ -1,82 +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. - -# This builds "stand-alone" Mesa, a version of libGL that does not need the -# GLX extension. All rendering is converted to Xlib calls. No hardware -# acceleration. - -EXTRA_DIST = SConscript meson.build - -if HAVE_SHARED_GLAPI -SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/mesa/main \ - $(X11_INCLUDES) \ - $(DEFINES) - -lib_LTLIBRARIES = lib@GL_LIB@.la - -lib@GL_LIB@_la_SOURCES = \ - glxapi.h \ - glxheader.h \ - xfonts.h \ - xmesaP.h \ - fakeglx.c \ - glxapi.c \ - xfonts.c \ - xm_api.c \ - xm_buffer.c \ - xm_dd.c \ - xmesa.h \ - xmesa_x.h \ - xm_line.c \ - xm_tri.c - -# Force usage of a C++ linker -nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp - -GL_MAJOR = 1 -GL_MINOR = 6 -GL_PATCH = 0 - -lib@GL_LIB@_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(SHARED_GLAPI_LIB) \ - $(GL_LIB_DEPS) - -lib@GL_LIB@_la_LDFLAGS = \ - -no-undefined \ - -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ - $(BSYMBOLIC) \ - $(GC_SECTIONS) \ - $(LD_NO_UNDEFINED) - -include $(top_srcdir)/install-lib-links.mk diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am deleted file mode 100644 index 94266a1d4ab..00000000000 --- a/src/mesa/main/tests/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -AM_CFLAGS = \ - $(PTHREAD_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi/glapi \ - -I$(top_srcdir)/src/mapi/glapi \ - -I$(top_builddir)/src/mesa \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/include \ - $(DEFINES) $(INCLUDE_DIRS) - -TESTS = main-test -check_PROGRAMS = main-test - -main_test_SOURCES = \ - enum_strings.cpp - -main_test_LDADD = \ - $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/gtest/libgtest.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) \ - $(CLOCK_LIB) - -if HAVE_SHARED_GLAPI -main_test_SOURCES += \ - dispatch_sanity.cpp \ - mesa_formats.cpp \ - mesa_extensions.cpp \ - program_state_string.cpp - -main_test_LDADD += \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la -else -main_test_SOURCES += \ - stubs.cpp -endif - -EXTRA_DIST = meson.build diff --git a/src/mesa/state_tracker/tests/Makefile.am b/src/mesa/state_tracker/tests/Makefile.am deleted file mode 100644 index 0665a880844..00000000000 --- a/src/mesa/state_tracker/tests/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CFLAGS = \ - $(PTHREAD_CFLAGS) - -AM_CXXFLAGS = \ - $(GALLIUM_DRIVER_CXXFLAGS) \ - $(CXX11_CXXFLAGS) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mesa \ - -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/compiler/glsl \ - $(DEFINES) - -if HAVE_STD_CXX11 -if HAVE_SHARED_GLAPI -TESTS = st-renumerate-test \ - st-array-merge-test -check_PROGRAMS = st-renumerate-test \ - st-array-merge-test - -check_LIBRARIES = libmesa-st-tests-common.a -endif -endif - -libmesa_st_tests_common_a_SOURCES = \ - st_tests_common.cpp \ - st_tests_common.h - -st_renumerate_test_SOURCES = \ - test_glsl_to_tgsi_lifetime.cpp - -st_renumerate_test_LDFLAGS = \ - $(LLVM_LDFLAGS) - -st_array_merge_test_SOURCES = \ - test_glsl_to_tgsi_array_merge.cpp - -st_array_merge_test_LDFLAGS = \ - $(LLVM_LDFLAGS) - -st_common_LDADD = \ - libmesa-st-tests-common.a \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(top_builddir)/src/gtest/libgtest.la \ - $(GALLIUM_COMMON_LIB_DEPS) \ - $(LLVM_LIBS) - -st_renumerate_test_LDADD = \ - $(st_common_LDADD) - -st_array_merge_test_LDADD = \ - $(st_common_LDADD) - -EXTRA_DIST = meson.build diff --git a/src/util/Makefile.am b/src/util/Makefile.am deleted file mode 100644 index 4bda54c551d..00000000000 --- a/src/util/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright © 2014 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. - -SUBDIRS = . \ - xmlpool \ - tests/fast_idiv_by_const \ - tests/hash_table \ - tests/string_buffer \ - tests/set - -if HAVE_STD_CXX11 -SUBDIRS += tests/vma -endif - -include Makefile.sources - -noinst_LTLIBRARIES = \ - libmesautil.la \ - libxmlconfig.la - -AM_CPPFLAGS = \ - $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include - -libmesautil_la_CPPFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary \ - $(VISIBILITY_CFLAGS) \ - $(MSVC2013_COMPAT_CFLAGS) \ - $(ZLIB_CFLAGS) - -libmesautil_la_SOURCES = \ - $(MESA_UTIL_FILES) \ - $(MESA_UTIL_GENERATED_FILES) - -libmesautil_la_LIBADD = \ - $(PTHREAD_LIBS) \ - $(CLOCK_LIB) \ - $(ZLIB_LIBS) \ - $(LIBATOMIC_LIBS) \ - -lm - -libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES) -libxmlconfig_la_CFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DDATADIR=\"$(datadir)\" \ - $(VISIBILITY_CFLAGS) \ - $(EXPAT_CFLAGS) -libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm - -drircdir = $(datadir)/drirc.d -drirc_DATA = 00-mesa-defaults.conf - -u_atomic_test_LDADD = libmesautil.la -roundeven_test_LDADD = -lm -mesa_sha1_test_LDADD = libmesautil.la - -check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test -TESTS = $(check_PROGRAMS) - -BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = \ - 00-mesa-defaults.conf \ - format_srgb.py \ - merge_driinfo.py \ - SConscript \ - xmlpool.h \ - sha1/README \ - meson.build - -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -format_srgb.c: format_srgb.py - $(PYTHON_GEN) $(srcdir)/format_srgb.py > $@ diff --git a/src/util/tests/fast_idiv_by_const/Makefile.am b/src/util/tests/fast_idiv_by_const/Makefile.am deleted file mode 100644 index 1ebee09f59b..00000000000 --- a/src/util/tests/fast_idiv_by_const/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright © 2018 Intel -# -# 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = fast_idiv_by_const_test - -check_PROGRAMS = $(TESTS) - -fast_idiv_by_const_test_SOURCES = \ - fast_idiv_by_const_test.cpp - -fast_idiv_by_const_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/hash_table/Makefile.am b/src/util/tests/hash_table/Makefile.am deleted file mode 100644 index 526454cb1ed..00000000000 --- a/src/util/tests/hash_table/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright © 2009 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/util \ - $(DEFINES) - -LDADD = \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -TESTS = \ - clear \ - collision \ - delete_and_lookup \ - delete_management \ - destroy_callback \ - insert_and_lookup \ - insert_many \ - null_destroy \ - random_entry \ - remove_key \ - remove_null \ - replacement \ - $() - -check_PROGRAMS = $(TESTS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/set/Makefile.am b/src/util/tests/set/Makefile.am deleted file mode 100644 index 5529f4c144a..00000000000 --- a/src/util/tests/set/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2018 Intel -# -# 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = set_test - -check_PROGRAMS = $(TESTS) - -set_test_SOURCES = \ - set_test.cpp - -set_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/string_buffer/Makefile.am b/src/util/tests/string_buffer/Makefile.am deleted file mode 100644 index 8bc8a9c9b6c..00000000000 --- a/src/util/tests/string_buffer/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2017 Thomas Helland -# -# 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gtest/include \ - $(PTHREAD_CFLAGS) \ - $(DEFINES) - -TESTS = string_buffer_test - -check_PROGRAMS = $(TESTS) - -string_buffer_test_SOURCES = \ - string_buffer_test.cpp - -string_buffer_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) - -EXTRA_DIST = meson.build diff --git a/src/util/tests/vma/Makefile.am b/src/util/tests/vma/Makefile.am deleted file mode 100644 index b9ca8f5977a..00000000000 --- a/src/util/tests/vma/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/util \ - $(DEFINES) - -TESTS = vma_random_test - -check_PROGRAMS = $(TESTS) - -vma_random_test_SOURCES = \ - vma_random_test.cpp - -vma_random_test_LDADD = \ - $(top_builddir)/src/util/libmesautil.la - -vma_random_test_CXXFLAGS = $(CXX11_CXXFLAGS) - -EXTRA_DIST = meson.build diff --git a/src/util/xmlpool/Makefile.am b/src/util/xmlpool/Makefile.am deleted file mode 100644 index 2b01391401b..00000000000 --- a/src/util/xmlpool/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -# Convenient makefile for managing translations. - -# Prerequisites: -# - GNU gettext -# - Python - -# Adding new translations -# ----------------------- - -# To start working on a new translation edit the POS=... line -# below. If you want to add for example a french translation, add -# fr.po. - -# Then run "make po" to generate a fresh .po file from translatable -# strings in t_options.h. Now you can edit the new .po file (fr.po in -# the example above) to translate the strings. Please make sure that -# your editor encodes the file in UTF-8. - -# Updating existing translations -# ------------------------------ - -# Run "make po" to update .po files with new translatable strings from -# t_options.h. Now you can edit the .po files you're interested -# in. Please make sure that your editor encodes the file in UTF-8. - -# Updating options.h -# ------------------ - -# Finally run "make" to generate options.h from t_options.h with all -# translations. Now you can rebuild the drivers. Any common options -# used by the drivers will have option descriptions with the latest -# translations. - -# Publishing translations -# ----------------------- - -# To get your translation(s) into Mesa CVS, please send me your -# <lang>.po file. - -# More information: -# - info gettext - -# The set of supported languages. Add languages as needed. -POS=ca.po de.po es.po nl.po fr.po sv.po - -# -# Don't change anything below, unless you know what you're doing. -# -LANGS=$(POS:%.po=%) -MOS=$(POS:%.po=%.gmo) -POT=xmlpool.pot - -.PHONY: all clean clean-local pot po mo - -EXTRA_DIST = \ - gen_xmlpool.py \ - options.h \ - t_options.h \ - $(POS) \ - $(MOS) \ - SConscript \ - meson.build \ - LINGUAS \ - POTFILES - -BUILT_SOURCES = options.h -CLEANFILES = \ - options.h - $(POS) \ - $(MOS) - -clean-local: - rm -f $(MOS) - -# Default target options.h -LOCALEDIR := . -options.h: t_options.h $(MOS) - $(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \ - --template $(srcdir)/t_options.h \ - --output options.h \ - --localedir $(LOCALEDIR) \ - --languages $(LANGS) - -# Update .mo files from the corresponding .po files. -%.gmo: %.po - @mo="$@"; \ - lang=$${mo%%/*}; \ - echo "Updating ($$lang) $@ from $?."; \ - msgfmt -o $@ $? - -# Use this target to create or update .po files with new messages in -# driconf.py. -po: $(POT) - @for po in $(POS); do \ - if [ -f $$po ]; then \ - echo "Merging new strings from $(POT) into $@."; \ - mv $$po $$po~; \ - msgmerge -o $$po $$po~ $(POT); \ - else \ - echo "Initializing $$po from $(POT)."; \ - msginit -i $(POT) -o $$po~ --locale=$*; \ - sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $$po~ > $$po; \ - fi \ - done - -pot: $(POT) - -# Extract message catalog from driconf.py. -$(POT): t_options.h - xgettext -L C --from-code utf-8 -o $(POT) t_options.h diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am deleted file mode 100644 index 9d5416fc855..00000000000 --- a/src/vulkan/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -include Makefile.sources - -noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la - -vulkan_includedir = $(includedir)/vulkan -vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml - -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) - -EXTRA_DIST = \ - overlay-layer/README \ - overlay-layer/meson.build \ - overlay-layer/overlay.cpp \ - overlay-layer/overlay_params.c \ - overlay-layer/overlay_params.h \ - overlay-layer/overlay.frag \ - overlay-layer/overlay.vert \ - overlay-layer/VkLayer_MESA_overlay.json.in \ - overlay-layer/vk_layer_table.cpp \ - overlay-layer/vk_layer_table.h \ - util/gen_enum_to_str.py \ - util/meson.build \ - wsi/meson.build \ - meson.build - -AM_CPPFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vulkan/util \ - -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_srcdir)/src/gallium/include - -AM_CFLAGS = \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) - -VULKAN_WSI_GENERATED_SOURCES = - -VULKAN_WSI_SOURCES = \ - $(VULKAN_WSI_FILES) - -if HAVE_PLATFORM_X11 -AM_CPPFLAGS += \ - $(XCB_DRI3_CFLAGS) \ - -DVK_USE_PLATFORM_XCB_KHR \ - -DVK_USE_PLATFORM_XLIB_KHR - -VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES) -endif - -if HAVE_PLATFORM_DRM -AM_CPPFLAGS += \ - -DVK_USE_PLATFORM_DISPLAY_KHR - -VULKAN_WSI_SOURCES += $(VULKAN_WSI_DISPLAY_FILES) -endif - -if HAVE_XLIB_LEASE -AM_CPPFLAGS += \ - $(XCB_RANDR_CFLAGS) \ - $(XLIB_RANDR_CFLAGS) \ - -DVK_USE_PLATFORM_XLIB_XRANDR_EXT -endif - -CLEANFILES = \ - $(VULKAN_UTIL_GENERATED_FILES) \ - $(VULKAN_WSI_WAYLAND_GENERATED_FILES) - -WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml - -wsi/wayland-drm-protocol.c : $(WL_DRM_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@ - -wsi/wayland-drm-client-protocol.h : $(WL_DRM_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@ - -WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml - -wsi/linux-dmabuf-unstable-v1-protocol.c : $(WL_DMABUF_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@ - -wsi/linux-dmabuf-unstable-v1-client-protocol.h : $(WL_DMABUF_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@ - -if HAVE_PLATFORM_WAYLAND -wsi/linux-dmabuf-unstable-v1-protocol.lo: wsi/linux-dmabuf-unstable-v1-client-protocol.h -wsi/wayland-drm-protocol.lo: wsi/wayland-drm-client-protocol.h -wsi/wsi_common_wayland.lo: wsi/linux-dmabuf-unstable-v1-client-protocol.h wsi/wayland-drm-client-protocol.h - -AM_CPPFLAGS += \ - -I$(top_builddir)/src/vulkan/wsi \ - $(WAYLAND_CLIENT_CFLAGS) \ - -DVK_USE_PLATFORM_WAYLAND_KHR - -VULKAN_WSI_SOURCES += \ - $(VULKAN_WSI_WAYLAND_FILES) - -VULKAN_WSI_GENERATED_SOURCES += \ - $(VULKAN_WSI_WAYLAND_GENERATED_FILES) - -endif - -VULKAN_UTIL_SOURCES = \ - $(VULKAN_UTIL_FILES) \ - $(VULKAN_UTIL_GENERATED_FILES) - -util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py \ - $(vulkan_api_xml) - $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py \ - --xml $(vulkan_api_xml) \ - --outdir $(top_builddir)/src/vulkan/util - -libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES) - -nodist_libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_GENERATED_SOURCES) - -libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES) |