[Mesa-stable] [PATCH] meson: remove incomplete build system from 17.3 release
Dylan Baker
dylan at pnwbakers.com
Tue Nov 14 23:06:59 UTC 2017
This build system is rather incomplete in the 17.3 tree, multiple bugs
have been fixed, and there are a number of very visibly user facing
changes that have been made (changing the default buildtype, for
example). It's not shipped in the tarball, but I don't want to receive
bug reports about 17.3, 18.0 is the release that I hope to have the
meson build in shape for.
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
include/meson.build | 68 ---
meson.build | 813 --------------------------
meson_options.txt | 156 -----
src/amd/addrlib/meson.build | 63 --
src/amd/common/meson.build | 63 --
src/amd/meson.build | 27 -
src/amd/vulkan/meson.build | 140 -----
src/broadcom/cle/meson.build | 59 --
src/broadcom/compiler/meson.build | 44 --
src/broadcom/meson.build | 44 --
src/broadcom/qpu/meson.build | 39 --
src/compiler/glsl/glcpp/meson.build | 56 --
src/compiler/glsl/meson.build | 245 --------
src/compiler/glsl/tests/meson.build | 76 ---
src/compiler/meson.build | 68 ---
src/compiler/nir/meson.build | 207 -------
src/egl/meson.build | 186 ------
src/egl/wayland/wayland-drm/meson.build | 47 --
src/egl/wayland/wayland-egl/meson.build | 42 --
src/gallium/auxiliary/meson.build | 530 -----------------
src/gallium/auxiliary/pipe-loader/meson.build | 69 ---
src/gallium/drivers/ddebug/meson.build | 28 -
src/gallium/drivers/llvmpipe/meson.build | 116 ----
src/gallium/drivers/noop/meson.build | 27 -
src/gallium/drivers/nouveau/meson.build | 224 -------
src/gallium/drivers/radeon/meson.build | 55 --
src/gallium/drivers/radeonsi/meson.build | 78 ---
src/gallium/drivers/rbug/meson.build | 28 -
src/gallium/drivers/softpipe/meson.build | 85 ---
src/gallium/drivers/trace/meson.build | 29 -
src/gallium/drivers/vc4/meson.build | 101 ----
src/gallium/drivers/vc5/meson.build | 65 --
src/gallium/meson.build | 81 ---
src/gallium/state_trackers/dri/meson.build | 57 --
src/gallium/targets/dri/meson.build | 129 ----
src/gallium/winsys/amdgpu/drm/meson.build | 36 --
src/gallium/winsys/nouveau/drm/meson.build | 30 -
src/gallium/winsys/pl111/drm/meson.build | 30 -
src/gallium/winsys/radeon/drm/meson.build | 30 -
src/gallium/winsys/sw/dri/meson.build | 27 -
src/gallium/winsys/sw/kms-dri/meson.build | 29 -
src/gallium/winsys/sw/null/meson.build | 27 -
src/gallium/winsys/sw/wrapper/meson.build | 27 -
src/gallium/winsys/vc4/drm/meson.build | 29 -
src/gallium/winsys/vc5/drm/meson.build | 29 -
src/gbm/meson.build | 75 ---
src/glx/meson.build | 185 ------
src/glx/tests/meson.build | 49 --
src/gtest/meson.build | 31 -
src/intel/blorp/meson.build | 37 --
src/intel/common/meson.build | 45 --
src/intel/compiler/meson.build | 155 -----
src/intel/genxml/meson.build | 59 --
src/intel/isl/meson.build | 105 ----
src/intel/meson.build | 31 -
src/intel/tools/meson.build | 39 --
src/intel/vulkan/meson.build | 183 ------
src/loader/meson.build | 47 --
src/mapi/es1api/meson.build | 54 --
src/mapi/es2api/meson.build | 54 --
src/mapi/glapi/gen/meson.build | 269 ---------
src/mapi/glapi/meson.build | 84 ---
src/mapi/meson.build | 37 --
src/mapi/shared-glapi/meson.build | 61 --
src/mesa/drivers/dri/common/meson.build | 39 --
src/mesa/drivers/dri/i915/meson.build | 97 ---
src/mesa/drivers/dri/i965/meson.build | 177 ------
src/mesa/drivers/dri/meson.build | 61 --
src/mesa/drivers/dri/swrast/meson.build | 30 -
src/mesa/main/meson.build | 46 --
src/mesa/main/tests/meson.build | 43 --
src/mesa/meson.build | 723 -----------------------
src/mesa/program/meson.build | 33 --
src/meson.build | 68 ---
src/util/meson.build | 138 -----
src/util/tests/hash_table/meson.build | 32 -
src/util/tests/string_buffer/meson.build | 29 -
src/util/xmlpool/meson.build | 28 -
src/vulkan/meson.build | 28 -
src/vulkan/util/meson.build | 41 --
src/vulkan/wsi/meson.build | 65 --
81 files changed, 7717 deletions(-)
delete mode 100644 include/meson.build
delete mode 100644 meson.build
delete mode 100644 meson_options.txt
delete mode 100644 src/amd/addrlib/meson.build
delete mode 100644 src/amd/common/meson.build
delete mode 100644 src/amd/meson.build
delete mode 100644 src/amd/vulkan/meson.build
delete mode 100644 src/broadcom/cle/meson.build
delete mode 100644 src/broadcom/compiler/meson.build
delete mode 100644 src/broadcom/meson.build
delete mode 100644 src/broadcom/qpu/meson.build
delete mode 100644 src/compiler/glsl/glcpp/meson.build
delete mode 100644 src/compiler/glsl/meson.build
delete mode 100644 src/compiler/glsl/tests/meson.build
delete mode 100644 src/compiler/meson.build
delete mode 100644 src/compiler/nir/meson.build
delete mode 100644 src/egl/meson.build
delete mode 100644 src/egl/wayland/wayland-drm/meson.build
delete mode 100644 src/egl/wayland/wayland-egl/meson.build
delete mode 100644 src/gallium/auxiliary/meson.build
delete mode 100644 src/gallium/auxiliary/pipe-loader/meson.build
delete mode 100644 src/gallium/drivers/ddebug/meson.build
delete mode 100644 src/gallium/drivers/llvmpipe/meson.build
delete mode 100644 src/gallium/drivers/noop/meson.build
delete mode 100644 src/gallium/drivers/nouveau/meson.build
delete mode 100644 src/gallium/drivers/radeon/meson.build
delete mode 100644 src/gallium/drivers/radeonsi/meson.build
delete mode 100644 src/gallium/drivers/rbug/meson.build
delete mode 100644 src/gallium/drivers/softpipe/meson.build
delete mode 100644 src/gallium/drivers/trace/meson.build
delete mode 100644 src/gallium/drivers/vc4/meson.build
delete mode 100644 src/gallium/drivers/vc5/meson.build
delete mode 100644 src/gallium/meson.build
delete mode 100644 src/gallium/state_trackers/dri/meson.build
delete mode 100644 src/gallium/targets/dri/meson.build
delete mode 100644 src/gallium/winsys/amdgpu/drm/meson.build
delete mode 100644 src/gallium/winsys/nouveau/drm/meson.build
delete mode 100644 src/gallium/winsys/pl111/drm/meson.build
delete mode 100644 src/gallium/winsys/radeon/drm/meson.build
delete mode 100644 src/gallium/winsys/sw/dri/meson.build
delete mode 100644 src/gallium/winsys/sw/kms-dri/meson.build
delete mode 100644 src/gallium/winsys/sw/null/meson.build
delete mode 100644 src/gallium/winsys/sw/wrapper/meson.build
delete mode 100644 src/gallium/winsys/vc4/drm/meson.build
delete mode 100644 src/gallium/winsys/vc5/drm/meson.build
delete mode 100644 src/gbm/meson.build
delete mode 100644 src/glx/meson.build
delete mode 100644 src/glx/tests/meson.build
delete mode 100644 src/gtest/meson.build
delete mode 100644 src/intel/blorp/meson.build
delete mode 100644 src/intel/common/meson.build
delete mode 100644 src/intel/compiler/meson.build
delete mode 100644 src/intel/genxml/meson.build
delete mode 100644 src/intel/isl/meson.build
delete mode 100644 src/intel/meson.build
delete mode 100644 src/intel/tools/meson.build
delete mode 100644 src/intel/vulkan/meson.build
delete mode 100644 src/loader/meson.build
delete mode 100644 src/mapi/es1api/meson.build
delete mode 100644 src/mapi/es2api/meson.build
delete mode 100644 src/mapi/glapi/gen/meson.build
delete mode 100644 src/mapi/glapi/meson.build
delete mode 100644 src/mapi/meson.build
delete mode 100644 src/mapi/shared-glapi/meson.build
delete mode 100644 src/mesa/drivers/dri/common/meson.build
delete mode 100644 src/mesa/drivers/dri/i915/meson.build
delete mode 100644 src/mesa/drivers/dri/i965/meson.build
delete mode 100644 src/mesa/drivers/dri/meson.build
delete mode 100644 src/mesa/drivers/dri/swrast/meson.build
delete mode 100644 src/mesa/main/meson.build
delete mode 100644 src/mesa/main/tests/meson.build
delete mode 100644 src/mesa/meson.build
delete mode 100644 src/mesa/program/meson.build
delete mode 100644 src/meson.build
delete mode 100644 src/util/meson.build
delete mode 100644 src/util/tests/hash_table/meson.build
delete mode 100644 src/util/tests/string_buffer/meson.build
delete mode 100644 src/util/xmlpool/meson.build
delete mode 100644 src/vulkan/meson.build
delete mode 100644 src/vulkan/util/meson.build
delete mode 100644 src/vulkan/wsi/meson.build
diff --git a/include/meson.build b/include/meson.build
deleted file mode 100644
index 88e66a1a8f4..00000000000
--- a/include/meson.build
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright © 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 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.
-
-inc_drm_uapi = include_directories('drm-uapi')
-inc_vulkan = include_directories('vulkan')
-
-if with_gles1
- install_headers(
- 'GLES/egl.h', 'GLES/gl.h', 'GLES/glext.h', 'GLES/glplatform.h',
- subdir : 'GLES',
- )
-endif
-
-if with_gles2
- install_headers(
- 'GLES2/gl2.h', 'GLES2/gl2ext.h', 'GLES2/gl2platform.h',
- subdir : 'GLES2',
- )
- install_headers(
- 'GLES3/gl3.h', 'GLES3/gl32.h', 'GLES3/gl32.h', 'GLES3/gl3ext.h',
- 'GLES3/gl3platform.h',
- subdir : 'GLES3',
- )
-endif
-
-if with_gles1 or with_gles2 # or with_egl
- install_headers('KHR/khrplatform.h', subdir : 'KHR')
-endif
-
-if with_opengl
- install_headers(
- 'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h', 'GL/gl_mangle.h',
- subdir : 'GL',
- )
-endif
-
-if with_glx != 'disabled'
- install_headers('GL/glx.h', 'GL/glext.h', 'GL/glx_mangle.h', subdir : 'GL')
-endif
-
-if with_osmesa
- install_headers('GL/osmesa.h', subdir : 'GL')
-endif
-
-if with_egl
- install_headers(
- 'EGL/eglext.h', 'EGL/egl.h', 'EGL/eglextchromium.h', 'EGL/eglmesaext.h',
- 'EGL/eglplatform.h',
- subdir : 'EGL',
- )
-endif
diff --git a/meson.build b/meson.build
deleted file mode 100644
index 92b875b1a10..00000000000
--- a/meson.build
+++ /dev/null
@@ -1,813 +0,0 @@
-# Copyright © 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 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.
-
-project('mesa', ['c', 'cpp'], version : '17.3.0-devel', license : 'MIT',
- default_options : ['c_std=c99', 'cpp_std=c++11'])
-
-# Arguments for the preprocessor, put these in a separate array from the C and
-# C++ (cpp in meson terminology) arguments since they need to be added to the
-# default arguments for both C and C++.
-pre_args = [
- '-D__STDC_CONSTANT_MACROS',
- '-D__STDC_FORMAT_MACROS',
- '-D__STDC_LIMIT_MACROS',
- '-DVERSION="@0@"'.format(meson.project_version()),
- '-DPACKAGE_VERSION=VERSION',
- '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"',
- '-D_GNU_SOURCE',
-]
-
-with_vulkan_icd_dir = get_option('vulkan-icd-dir')
-with_tests = get_option('build-tests')
-with_valgrind = get_option('valgrind')
-with_asm = get_option('asm')
-with_llvm = get_option('llvm')
-if get_option('texture-float')
- pre_args += '-DTEXTURE_FLOAT_ENABLED'
- message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.')
-endif
-
-# XXX: yeah, do these
-with_appledri = false
-with_windowsdri = false
-
-dri_drivers_path = get_option('dri-drivers-path')
-if dri_drivers_path == ''
- dri_drivers_path = join_paths(get_option('libdir'), 'dri')
-endif
-
-with_gles1 = get_option('gles1')
-with_gles2 = get_option('gles2')
-with_opengl = get_option('opengl')
-with_any_opengl = with_opengl or with_gles1 or with_gles2
-# Only build shared_glapi if at least one OpenGL API is enabled
-with_shared_glapi = get_option('shared-glapi') and with_any_opengl
-
-# TODO: these will need options, but at the moment they just control header
-# installs
-with_osmesa = false
-
-# shared-glapi is required if at least two OpenGL APIs are being built
-if not with_shared_glapi
- if ((with_gles1 and with_gles2) or (with_gles1 and with_opengl)
- or (with_gles2 and with_opengl))
- error('shared-glapi required for building two or more of OpenGL, OpenGL ES 1.x, OpenGL ES 2.x')
- endif
-endif
-
-# We require OpenGL for OpenGL ES
-if (with_gles1 or with_gles2) and not with_opengl
- error('building OpenGL ES without OpenGL is not supported.')
-endif
-
-with_dri = false
-with_dri_i915 = false
-with_dri_i965 = false
-with_dri_swrast = false
-_drivers = get_option('dri-drivers')
-if _drivers != ''
- _split = _drivers.split(',')
- with_dri_i915 = _split.contains('i915')
- with_dri_i965 = _split.contains('i965')
- with_dri_swrast = _split.contains('swrast')
- with_dri = true
-endif
-
-with_gallium = false
-with_gallium_pl111 = false
-with_gallium_radeonsi = false
-with_gallium_nouveau = false
-with_gallium_softpipe = false
-with_gallium_vc4 = false
-with_gallium_vc5 = false
-_drivers = get_option('gallium-drivers')
-if _drivers != ''
- _split = _drivers.split(',')
- with_gallium_pl111 = _split.contains('pl111')
- with_gallium_radeonsi = _split.contains('radeonsi')
- with_gallium_nouveau = _split.contains('nouveau')
- with_gallium_softpipe = _split.contains('swrast')
- with_gallium_vc4 = _split.contains('vc4')
- with_gallium_vc5 = _split.contains('vc5')
- with_gallium = true
- with_dri = true
-endif
-
-if not (with_dri or with_gallium)
- with_gles1 = false
- with_gles2 = false
- with_opengl = false
- with_any_opengl = false
- with_shared_glapi = false
-endif
-
-if with_dri_swrast and with_gallium_softpipe
- error('Only one swrast provider can be built')
-endif
-
-dep_libdrm_intel = []
-if with_dri_i915
- dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75')
-endif
-
-# TODO: other OSes
-with_dri_platform = 'drm'
-
-# TODO: android platform
-with_platform_wayland = false
-with_platform_x11 = false
-with_platform_drm = false
-with_platform_surfaceless = false
-egl_native_platform = ''
-_platforms = get_option('platforms')
-if _platforms != ''
- _split = _platforms.split(',')
- with_platform_x11 = _split.contains('x11')
- with_platform_wayland = _split.contains('wayland')
- with_platform_drm = _split.contains('drm')
- with_platform_surfaceless = _split.contains('surfaceless')
- egl_native_platform = _split[0]
-endif
-
-with_gbm = get_option('gbm')
-if with_gbm == 'auto' and with_dri # TODO: or gallium
- with_gbm = host_machine.system() == 'linux'
-elif with_gbm == 'yes'
- if not ['linux', 'bsd'].contains(host_machine.system())
- error('GBM only supports unix-like platforms')
- endif
- with_gbm = true
-else
- with_gbm = false
-endif
-
-_egl = get_option('egl')
-if _egl == 'auto'
- with_egl = with_dri and with_shared_glapi and egl_native_platform != ''
-elif _egl == 'yes'
- if not with_dri
- error('EGL requires dri')
- elif not with_shared_glapi
- error('EGL requires shared-glapi')
- elif egl_native_platform == ''
- error('No platforms specified, consider -Dplatforms=drm,x11 at least')
- endif
- with_egl = true
-else
- with_egl = false
-endif
-
-# TODO: or virgl
-if with_egl and with_gallium_radeonsi and not (with_platform_drm or with_platform_surfaceless)
- error('RadeonSI requires drm or surfaceless platform when using EGL')
-endif
-
-pre_args += '-DGLX_USE_TLS'
-with_glx = get_option('glx')
-if with_glx != 'disabled'
- if not (with_platform_x11 and with_any_opengl)
- if with_glx == 'auto'
- with_glx = 'disabled'
- else
- error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
- endif
- elif with_glx == 'gallium-xlib'
- if not with_gallium
- error('Gallium-xlib based GLX requires at least one gallium driver')
- elif with_dri
- error('gallium-xlib conflicts with any dri driver')
- endif
- elif with_glx == 'dri' and not with_dri
- error('dri based GLX requires at least one DRI driver')
- elif with_glx == 'auto'
- if with_dri
- with_glx = 'dri'
- elif with_gallium
- with_glx = 'gallium-xlib'
- elif with_platform_x11 and with_any_opengl
- with_glx = 'xlib'
- else
- with_glx = 'disabled'
- endif
- endif
-endif
-
-with_glvnd = get_option('glvnd')
-if with_glvnd and with_glx != 'dri'
- message('glvnd requires dri based glx')
-endif
-
-# TODO: toggle for this
-with_glx_direct = true
-
-if with_vulkan_icd_dir == ''
- with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
-endif
-
-with_intel_vk = false
-with_amd_vk = false
-with_any_vk = false
-_vulkan_drivers = get_option('vulkan-drivers')
-if _vulkan_drivers != ''
- _split = _vulkan_drivers.split(',')
- with_intel_vk = _split.contains('intel')
- with_amd_vk = _split.contains('amd')
- with_any_vk = with_amd_vk or with_intel_vk
- if not (with_platform_x11 or with_platform_wayland)
- error('Vulkan requires at least one platform (x11, wayland)')
- endif
-endif
-
-with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
-with_dri3 = get_option('dri3')
-if with_dri3 == 'auto'
- if host_machine.system() == 'linux' and with_dri2
- with_dri3 = true
- else
- with_dri3 = false
- endif
-elif with_dri3 == 'yes'
- with_dri3 = true
-else
- with_dri3 = false
-endif
-
-if with_any_vk and (with_platform_x11 and not with_dri3)
- error('Vulkan drivers require dri3 for X11 support')
-endif
-if with_dri or with_gallium
- if with_glx == 'disabled' and not with_egl
- error('building dri or gallium drivers require at least one window system')
- endif
-endif
-
-with_gallium_xvmc = false
-with_gallium_vdpau = false
-with_gallium_omx = false # this is bellagio
-with_gallium_va = false
-with_gallium_media = false
-dep_va = []
-_drivers = get_option('gallium-media')
-if _drivers != ''
- _split = _drivers.split(',')
- with_gallium_xvmc = _split.contains('xvmc')
- with_gallium_vdpau = _split.contains('vdpau')
- with_gallium_omx = _split.contains('omx')
- with_gallium_va = _split.contains('va')
- with_gallium_media = (with_gallium_xvmc or with_gallium_vdpau or
- with_gallium_omx or with_gallium_va)
-endif
-
-gl_pkgconfig_c_flags = []
-if with_platform_x11
- if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
- pre_args += '-DHAVE_X11_PLATFORM'
- endif
- if with_glx == 'xlib'
- # TODO
- error('TODO')
- elif with_glx == 'gallium-xlib'
- # TODO
- error('TODO')
- else
- pre_args += '-DGLX_INDIRECT_RENDERING'
- if with_glx_direct
- pre_args += '-DGLX_DIRECT_RENDERING'
- endif
- if with_dri_platform == 'drm'
- pre_args += '-DGLX_USE_DRM'
- endif
- endif
-else
- pre_args += '-DMESA_EGL_NO_X11_HEADERS'
- gl_pkgconfig_c_flags += '-DMESA_EGL_NO_X11_HEADERS'
-endif
-if with_platform_drm
- if with_egl and not with_gbm
- error('EGL drm platform requires gbm')
- endif
- pre_args += '-DHAVE_DRM_PLATFORM'
-endif
-if with_platform_surfaceless
- pre_args += '-DHAVE_SURFACELESS_PLATFORM'
-endif
-
-prog_python2 = find_program('python2')
-has_mako = run_command(prog_python2, '-c', 'import mako')
-if has_mako.returncode() != 0
- error('Python (2.x) mako module required to build mesa.')
-endif
-
-cc = meson.get_compiler('c')
-if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6')
- error('When using GCC, version 4.4.6 or later is required.')
-endif
-
-# Define DEBUG for debug and debugoptimized builds
-if get_option('buildtype').startswith('debug')
- pre_args += '-DDEBUG'
-endif
-
-if get_option('shader-cache')
- pre_args += '-DENABLE_SHADER_CACHE'
-elif with_amd_vk
- error('Radv requires shader cache support')
-endif
-
-# Check for GCC style builtins
-foreach b : ['bswap32', 'bswap64', 'clz', 'clzll', 'ctz', 'expect', 'ffs',
- 'ffsll', 'popcount', 'popcountll', 'unreachable']
- if cc.has_function(b)
- pre_args += '-DHAVE___BUILTIN_ at 0@'.format(b.to_upper())
- endif
-endforeach
-
-# check for GCC __attribute__
-foreach a : ['const', 'flatten', 'malloc', 'pure', 'unused',
- 'warn_unused_result', 'weak',]
- if cc.compiles('int foo(void) __attribute__((@0@));'.format(a),
- name : '__attribute__((@0@))'.format(a))
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_ at 0@'.format(a.to_upper())
- endif
-endforeach
-if cc.compiles('int foo(const char *p, ...) __attribute__((format(printf, 1, 2)));',
- name : '__attribute__((format(...)))')
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_FORMAT'
-endif
-if cc.compiles('struct __attribute__((packed)) foo { int bar; };',
- name : '__attribute__((packed))')
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_PACKED'
-endif
-if cc.compiles('int *foo(void) __attribute__((returns_nonnull));',
- name : '__attribute__((returns_nonnull))')
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_NONNULL'
-endif
-if cc.compiles('''int foo_def(void) __attribute__((visibility("default")));
- int foo_hid(void) __attribute__((visibility("hidden")));
- int foo_int(void) __attribute__((visibility("internal")));
- int foo_pro(void) __attribute__((visibility("protected")));''',
- name : '__attribute__((visibility(...)))')
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_VISBILITY'
-endif
-if cc.compiles('int foo(void) { return 0; } int bar(void) __attribute__((alias("foo")));',
- name : '__attribute__((alias(...)))')
- pre_args += '-DHAVE_FUNC_ATTRIBUTE_ALIAS'
-endif
-
-# TODO: this is very incomplete
-if host_machine.system() == 'linux'
- pre_args += '-D_GNU_SOURCE'
-endif
-
-# Check for generic C arguments
-c_args = []
-foreach a : ['-Wall', '-Werror=implicit-function-declaration',
- '-Werror=missing-prototypes', '-fno-math-errno',
- '-fno-trapping-math', '-Qunused-arguments']
- if cc.has_argument(a)
- c_args += a
- endif
-endforeach
-c_vis_args = []
-if cc.has_argument('-fvisibility=hidden')
- c_vis_args += '-fvisibility=hidden'
-endif
-
-# Check for generic C++ arguments
-cpp = meson.get_compiler('cpp')
-cpp_args = []
-foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math',
- '-Qunused-arguments', '-Wno-non-virtual-dtor']
- if cpp.has_argument(a)
- cpp_args += a
- endif
-endforeach
-cpp_vis_args = []
-if cpp.has_argument('-fvisibility=hidden')
- cpp_vis_args += '-fvisibility=hidden'
-endif
-
-# Check for C and C++ arguments for MSVC2013 compatibility. These are only used
-# in parts of the mesa code base that need to compile with old versions of
-# MSVC, mainly common code
-c_msvc_compat_args = []
-cpp_msvc_compat_args = []
-foreach a : ['-Werror=pointer-arith', '-Werror=vla']
- if cc.has_argument(a)
- c_msvc_compat_args += a
- endif
- if cpp.has_argument(a)
- cpp_msvc_compat_args += a
- endif
-endforeach
-
-no_override_init_args = []
-foreach a : ['-Wno-override-init', '-Wno-initializer-overrides']
- if cc.has_argument(a)
- no_override_init_args += a
- endif
-endforeach
-
-# TODO: SSE41 (which is only required for core mesa)
-
-# Check for GCC style atomics
-if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }',
- name : 'GCC atomic builtins')
- pre_args += '-DUSE_GCC_ATOMIC_BUILTINS'
-endif
-if not cc.links('''#include <stdint.h>
- uint64_t v;
- int main() {
- return __sync_add_and_fetch(&v, (uint64_t)1);
- }''',
- name : 'GCC 64bit atomics')
- pre_args += '-DMISSING_64_BIT_ATOMICS'
-endif
-
-# TODO: endian
-# TODO: powr8
-# TODO: shared/static? Is this even worth doing?
-
-# I don't think that I need to set any of the debug stuff, I think meson
-# handles that for us
-
-# TODO: ldflags
-
-# TODO: texture-float (gallium/mesa only)
-
-# TODO: cross-compiling. I don't think this is relavent to meson
-
-# FIXME: enable asm when cross compiler
-# This is doable (autotools does it), but it's not of immediate concern
-if meson.is_cross_build()
- message('Cross compiling, disabling asm')
- with_asm = false
-endif
-
-with_asm_arch = ''
-if with_asm
- # TODO: SPARC and PPC
- if host_machine.cpu_family() == 'x86'
- if ['linux', 'bsd'].contains(host_machine.system()) # FIXME: hurd?
- with_asm_arch = 'x86'
- pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM',
- '-DUSE_SSE_ASM']
- endif
- elif host_machine.cpu_family() == 'x86_64'
- if host_machine.system() == 'linux'
- with_asm_arch = 'x86_64'
- pre_args += ['-DUSE_X86_64_ASM']
- endif
- elif host_machine.cpu_family() == 'arm'
- if host_machine.system() == 'linux'
- with_asm_arch = 'arm'
- pre_args += ['-DUSE_ARM_ASM']
- endif
- elif host_machine.cpu_family() == 'aarch64'
- if host_machine.system() == 'linux'
- with_asm_arch = 'aarch64'
- pre_args += ['-DUSE_AARCH64_ASM']
- endif
- endif
-endif
-
-# Check for standard headers and functions
-if cc.has_header_symbol('sys/sysmacros.h', 'major')
- pre_args += '-DMAJOR_IN_SYSMACROS'
-elif cc.has_header_symbol('sys/mkdev.h', 'major')
- pre_args += '-DMAJOR_IN_MKDEV'
-endif
-
-foreach h : ['xlocale.h', 'sys/sysctl.h']
- if cc.has_header(h)
- pre_args += '-DHAVE_ at 0@'.format(h.to_upper().underscorify())
- endif
-endforeach
-
-foreach f : ['strtof', 'mkostemp', 'posix_memalign']
- if cc.has_function(f)
- pre_args += '-DHAVE_ at 0@'.format(f.to_upper())
- endif
-endforeach
-
-# strtod locale support
-if cc.links('''
- #define _GNU_SOURCE
- #include <stdlib.h>
- #include <locale.h>
- #ifdef HAVE_XLOCALE_H
- #include <xlocale.h>
- #endif
- int main() {
- locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL);
- const char *s = "1.0";
- char *end;
- double d = strtod_l(s, end, loc);
- float f = strtod_l(s, end, loc);
- freelocale(loc);
- return 0;
- }''',
- extra_args : pre_args,
- name : 'strtod has locale support')
- pre_args += '-DHAVE_STRTOD_L'
-endif
-
-# Check for some linker flags
-ld_args_bsymbolic = []
-if cc.links('int main() { return 0; }', args : '-Wl,-Bsymbolic', name : 'Bsymbolic')
- ld_args_bsymbolic += '-Wl,-Bsymbolic'
-endif
-ld_args_gc_sections = []
-if cc.links('static char unused() { return 5; } int main() { return 0; }',
- args : '-Wl,--gc-sections', name : 'gc-sections')
- ld_args_gc_sections += '-Wl,--gc-sections'
-endif
-with_ld_version_script = false
-if cc.links('int main() { return 0; }',
- args : '-Wl,--version-script=@0@'.format(
- join_paths(meson.source_root(), 'build-support/conftest.map')),
- name : 'version-script')
- with_ld_version_script = true
-endif
-with_ld_dynamic_list = false
-if cc.links('int main() { return 0; }',
- args : '-Wl,--dynamic-list=@0@'.format(
- join_paths(meson.source_root(), 'build-support/conftest.dyn')),
- name : 'dynamic-list')
- with_ld_dynamic_list = true
-endif
-
-# check for dl support
-if cc.has_function('dlopen')
- dep_dl = []
-else
- dep_dl = cc.find_library('dl')
-endif
-if cc.has_function('dladdr', dependencies : dep_dl)
- # This is really only required for megadrivers
- pre_args += '-DHAVE_DLADDR'
-endif
-
-if cc.has_function('dl_iterate_phdr')
- pre_args += '-DHAVE_DL_ITERATE_PHDR'
-else
- # TODO: this is required for vulkan
-endif
-
-# Determine whether or not the rt library is needed for time functions
-if cc.has_function('clock_gettime')
- dep_clock = []
-else
- dep_clock = cc.find_library('rt')
-endif
-
-with_gallium_drisw_kms = false
-dep_libdrm = dependency('libdrm', version : '>= 2.4.75',
- required : with_dri2 or with_dri3)
-if dep_libdrm.found()
- pre_args += '-DHAVE_LIBDRM'
- if with_dri_platform == 'drm' and with_dri
- with_gallium_drisw_kms = true
- endif
-endif
-
-# TODO: some of these may be conditional
-dep_zlib = dependency('zlib', version : '>= 1.2.3')
-dep_thread = dependency('threads')
-if dep_thread.found() and host_machine.system() == 'linux'
- pre_args += '-DHAVE_PTHREAD'
-endif
-dep_elf = dependency('libelf', required : false)
-if not dep_elf.found() and (with_amd_vk or with_gallium_radeonsi) # TODO: clover, r600
- dep_elf = cc.find_library('elf')
-endif
-dep_expat = dependency('expat')
-# this only exists on linux so either this is linux and it will be found, or
-# its not linux and and wont
-dep_m = cc.find_library('m', required : false)
-
-dep_libdrm_amdgpu = []
-dep_libdrm_radeon = []
-dep_libdrm_nouveau = []
-if with_amd_vk or with_gallium_radeonsi
- dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.85')
-endif
-if with_gallium_radeonsi # older radeon too
- dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.71')
-endif
-if with_gallium_nouveau
- dep_libdrm_nouveau = dependency('libdrm_nouveau', version : '>= 2.4.66')
-endif
-
-llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
-if with_amd_vk
- llvm_modules += ['amdgpu', 'bitreader', 'ipo']
-endif
-dep_llvm = dependency(
- 'llvm', version : '>= 3.9.0', required : with_amd_vk, modules : llvm_modules,
-)
-if with_llvm
- if dep_llvm.found()
- _llvm_version = dep_llvm.version().split('.')
- # Development versions of LLVM have an 'svn' suffix, we don't want that for
- # our version checks.
- _llvm_patch = _llvm_version[2]
- if _llvm_patch.endswith('svn')
- _llvm_patch = _llvm_patch.split('s')[0]
- endif
- pre_args += [
- '-DHAVE_LLVM=0x0 at 0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch),
- '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch),
- ]
- else
- if with_gallium_softpipe
- error('Cannot find LLVM to build LLVMPipe. If you wanted softpipe pass -Dllvm=false to meson')
- elif with_amd_vk or with_gallium_radeonsi # etc
- error('The following drivers requires LLVM: Radv, RadeonSI. One of these is enabled, but LLVM was not found.')
- endif
- endif
-elif with_amd_vk or with_gallium_radeonsi
- error('The following drivers requires LLVM: Radv, RadeonSI. One of these is enabled, but LLVM is disabled.')
-endif
-
-dep_glvnd = []
-if with_glvnd
- dep_glvnd = dependency('libglvnd', version : '>= 0.2.0')
- pre_args += '-DUSE_LIBGLVND=1'
-endif
-
-# TODO: make this conditional
-dep_valgrind = dependency('valgrind', required : false)
-if dep_valgrind.found() and with_valgrind
- pre_args += '-DHAVE_VALGRIND'
-endif
-
-# pthread stubs. Lets not and say we didn't
-
-prog_bison = find_program('bison', required : with_any_opengl)
-prog_flex = find_program('flex', required : with_any_opengl)
-
-# TODO: selinux
-dep_selinux = []
-
-# TODO: llvm-prefix and llvm-shared-libs
-
-dep_unwind = dependency('libunwind', required : false)
-if dep_unwind.found()
- pre_args += '-DHAVE_LIBUNWIND'
-endif
-
-# TODO: flags for opengl, gles, dri
-
-# TODO: gallium-hud
-
-# TODO: glx provider
-
-# TODO: osmesa provider
-
-# TODO: symbol mangling
-
-if with_platform_wayland
- prog_wl_scanner = find_program('wayland-scanner')
- dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8')
- dep_wayland_client = dependency('wayland-client', version : '>=1.11')
- dep_wayland_server = dependency('wayland-server', version : '>=1.11')
- wayland_dmabuf_xml = join_paths(
- dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
- 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
- )
- pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
-else
- prog_wl_scanner = []
- dep_wl_protocols = []
- dep_wayland_client = []
- dep_wayland_server = []
- wayland_dmabuf_xml = ''
-endif
-
-dep_x11 = []
-dep_xext = []
-dep_xdamage = []
-dep_xfixes = []
-dep_x11_xcb = []
-dep_xcb_glx = []
-dep_xcb_dri2 = []
-dep_xcb_dri3 = []
-dep_dri2proto = []
-dep_glproto = []
-dep_xf86vm = []
-dep_xcb_dri3 = []
-dep_xcb_present = []
-dep_xcb_sync = []
-dep_xcb_xfixes = []
-dep_xshmfence = []
-if with_platform_x11
- if with_glx == 'dri' and with_dri_platform == 'drm'
- dep_x11 = dependency('x11')
- dep_xext = dependency('xext')
- dep_xdamage = dependency('xdamage', version : '>= 1.1')
- dep_xfixes = dependency('xfixes')
- dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
- dep_xf86vm = dependency('xxf86vm', required : false)
- endif
- if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
- dep_xcb = dependency('xcb')
- dep_x11_xcb = dependency('x11-xcb')
- dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
-
- if with_dri3
- pre_args += '-DHAVE_DRI3'
- dep_xcb_dri3 = dependency('xcb-dri3')
- dep_xcb_present = dependency('xcb-present')
- dep_xcb_sync = dependency('xcb-sync')
- dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
- endif
- endif
- if with_glx != 'disabled'
- dep_dri2proto = dependency('dri2proto', version : '>= 2.8')
- dep_glproto = dependency('glproto', version : '>= 1.4.14')
- endif
- if with_egl
- dep_xcb_xfixes = dependency('xcb-xfixes')
- endif
-endif
-
-# TODO: osmesa
-
-# TODO: vallium G3DVL
-
-# TODO: nine
-
-# TODO: clover
-
-# TODO: gallium tests
-
-# TODO: various libdirs
-
-# TODO: swr
-
-# TODO: gallium driver dirs
-
-# FIXME: this is a workaround for #2326
-prog_touch = find_program('touch')
-dummy_cpp = custom_target(
- 'dummy_cpp',
- output : 'dummy.cpp',
- command : [prog_touch, '@OUTPUT@'],
-)
-
-foreach a : pre_args
- add_project_arguments(a, language : ['c', 'cpp'])
-endforeach
-foreach a : c_args
- add_project_arguments(a, language : ['c'])
-endforeach
-foreach a : cpp_args
- add_project_arguments(a, language : ['cpp'])
-endforeach
-
-inc_include = include_directories('include')
-
-gl_priv_reqs = [
- 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
- 'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75',
-]
-if dep_xf86vm != [] and dep_xf86vm.found()
- gl_priv_reqs += 'xf86vm'
-endif
-if with_dri_platform == 'drm'
- gl_priv_reqs += 'xcb-dri2 >= 1.8'
-endif
-
-gl_priv_libs = []
-if dep_thread.found()
- gl_priv_libs += ['-lpthread', '-pthread']
-endif
-if dep_m.found()
- gl_priv_libs += '-lm'
-endif
-if dep_dl.found()
- gl_priv_libs += '-ldl'
-endif
-
-pkg = import('pkgconfig')
-
-subdir('include')
-subdir('src')
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index 87aef95198b..00000000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright © 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 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.
-
-option(
- 'platforms',
- type : 'string',
- value : 'x11,wayland,drm,surfaceless',
- description : 'comma separated list of window systems to support. wayland, x11, surfaceless, drm, etc.'
-)
-option(
- 'dri3',
- type : 'combo',
- value : 'auto',
- choices : ['auto', 'yes', 'no'],
- description : 'enable support for dri3'
-)
-option(
- 'dri-drivers',
- type : 'string',
- value : 'i915,i965',
- description : 'comma separated list of dri drivers to build.'
-)
-option(
- 'dri-drivers-path',
- type : 'string',
- value : '',
- description : 'Location of dri drivers. Default: $libdir/dri.'
-)
-option(
- 'gallium-drivers',
- type : 'string',
- value : 'pl111,radeonsi,nouveau,swrast,vc4',
- description : 'comma separated list of gallium drivers to build.'
-)
-option(
- 'gallium-media',
- type : 'string',
- value : '',
- description : 'comma separated list of gallium media APIs to build (omx,va,vdpau,xvmc).'
-)
-option(
- 'vulkan-drivers',
- type : 'string',
- value : 'intel,amd',
- description : 'comma separated list of vulkan drivers to build.'
-)
-option(
- 'shader-cache',
- type : 'boolean',
- value : true,
- description : 'Build with on-disk shader cache support'
-)
-option(
- 'vulkan-icd-dir',
- type : 'string',
- value : '',
- description : 'Location relative to prefix to put vulkan icds on install. Default: $datadir/vulkan/icd.d'
-)
-option(
- 'shared-glapi',
- type : 'boolean',
- value : true,
- description : 'Whether to build a shared or static glapi'
-)
-option(
- 'gles1',
- type : 'boolean',
- value : true,
- description : 'Build support for OpenGL ES 1.x'
-)
-option(
- 'gles2',
- type : 'boolean',
- value : true,
- description : 'Build support for OpenGL ES 2.x and 3.x'
-)
-option(
- 'opengl',
- type : 'boolean',
- value : true,
- description : 'Build support for OpenGL (all versions)'
-)
-option(
- 'gbm',
- type : 'combo',
- value : 'auto',
- choices : ['auto', 'yes', 'no'],
- description : 'Build support for gbm platform'
-)
-option(
- 'glx',
- type : 'combo',
- value : 'auto',
- choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
- description : 'Build support for GLX platform'
-)
-option(
- 'egl',
- type : 'combo',
- value : 'auto',
- choices : ['auto', 'yes', 'no'],
- description : 'Build support for EGL platform'
-)
-option(
- 'glvnd',
- type : 'boolean',
- value : false,
- description : 'Enable GLVND support.'
-)
-option(
- 'asm',
- type : 'boolean',
- value : true,
- description : 'Build assembly code if possible'
-)
-option(
- 'llvm',
- type : 'boolean',
- value : true,
- description : 'Build with LLVM support.'
-)
-option(
- 'valgrind',
- type : 'boolean',
- value : true,
- description : 'Build with valgrind support if possible'
-)
-option(
- 'build-tests',
- type : 'boolean',
- value : false,
- description : 'Build unit tests. Currently this will build *all* unit tests, which may build more than expected.'
-)
-option(
- 'texture-float',
- type : 'boolean',
- value : false,
- description : 'Enable floating point textures and renderbuffers. This option may be patent encumbered, please read docs/patents.txt and consult with your lawyer before turning this on.'
-)
diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
deleted file mode 100644
index a6cad1207b0..00000000000
--- a/src/amd/addrlib/meson.build
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright © 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 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.
-
-files_addrlib = files(
- 'addrinterface.cpp',
- 'addrinterface.h',
- 'addrtypes.h',
- 'core/addrcommon.h',
- 'core/addrelemlib.cpp',
- 'core/addrelemlib.h',
- 'core/addrlib.cpp',
- 'core/addrlib.h',
- 'core/addrlib1.cpp',
- 'core/addrlib1.h',
- 'core/addrlib2.cpp',
- 'core/addrlib2.h',
- 'core/addrobject.cpp',
- 'core/addrobject.h',
- 'gfx9/chip/gfx9_enum.h',
- 'gfx9/coord.cpp',
- 'gfx9/coord.h',
- 'gfx9/gfx9addrlib.cpp',
- 'gfx9/gfx9addrlib.h',
- 'gfx9/rbmap.cpp',
- 'gfx9/rbmap.h',
- 'inc/chip/gfx9/gfx9_gb_reg.h',
- 'inc/chip/r800/si_gb_reg.h',
- 'inc/lnx_common_defs.h',
- 'r800/chip/si_ci_vi_merged_enum.h',
- 'r800/ciaddrlib.cpp',
- 'r800/ciaddrlib.h',
- 'r800/egbaddrlib.cpp',
- 'r800/egbaddrlib.h',
- 'r800/siaddrlib.cpp',
- 'r800/siaddrlib.h',
-)
-
-libamdgpu_addrlib = static_library(
- 'addrlib',
- files_addrlib,
- include_directories : include_directories(
- 'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
- '../common', '../../'),
- cpp_args : [cpp_vis_args, '-DBRAHMA_BUILD=1'],
- build_by_default : false,
-)
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
deleted file mode 100644
index 842b42f897e..00000000000
--- a/src/amd/common/meson.build
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright © 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 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.
-
-inc_amd_common = include_directories('.')
-
-sid_tables_h = custom_target(
- 'sid_tables_h',
- input : ['sid_tables.py', 'sid.h', 'gfx9d.h'],
- output : 'sid_tables.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-amd_common_files = files(
- 'ac_binary.c',
- 'ac_binary.h',
- 'ac_exp_param.h',
- 'ac_llvm_build.c',
- 'ac_llvm_build.h',
- 'ac_llvm_helper.cpp',
- 'ac_llvm_util.c',
- 'ac_llvm_util.h',
- 'ac_shader_abi.h',
- 'ac_shader_info.c',
- 'ac_shader_info.h',
- 'ac_nir_to_llvm.c',
- 'ac_nir_to_llvm.h',
- 'ac_gpu_info.c',
- 'ac_gpu_info.h',
- 'ac_surface.c',
- 'ac_surface.h',
- 'ac_debug.c',
- 'ac_debug.h',
-)
-
-libamd_common = static_library(
- 'amd_common',
- [amd_common_files, sid_tables_h, nir_opcodes_h],
- include_directories : [inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi,
- inc_amd],
- dependencies : [dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu,
- dep_valgrind],
- c_args : [c_vis_args],
- cpp_args : [cpp_vis_args],
- build_by_default : false,
-)
diff --git a/src/amd/meson.build b/src/amd/meson.build
deleted file mode 100644
index f96a9aac095..00000000000
--- a/src/amd/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 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 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.
-
-inc_amd = include_directories('.')
-
-subdir('addrlib')
-subdir('common')
-if with_amd_vk
- subdir('vulkan')
-endif
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
deleted file mode 100644
index 305a2f66f58..00000000000
--- a/src/amd/vulkan/meson.build
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright © 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 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.
-
-radv_entrypoints = custom_target(
- 'radv_entrypoints.[ch]',
- input : ['radv_entrypoints_gen.py', vk_api_xml],
- output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
- command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--outdir', meson.current_build_dir()],
- depend_files : files('radv_extensions.py'),
-)
-
-radv_extensions_c = custom_target(
- 'radv_extensions.c',
- input : ['radv_extensions.py', vk_api_xml],
- output : ['radv_extensions.c'],
- command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--out', '@OUTPUT@'],
-)
-
-vk_format_table_c = custom_target(
- 'vk_format_table.c',
- input : ['vk_format_table.py', 'vk_format_layout.csv'],
- output : 'vk_format_table.c',
- command : [prog_python2, '@INPUT@'],
- depend_files : files('vk_format_parse.py'),
- capture : true,
-)
-
-libradv_files = files(
- 'winsys/amdgpu/radv_amdgpu_bo.c',
- 'winsys/amdgpu/radv_amdgpu_bo.h',
- 'winsys/amdgpu/radv_amdgpu_cs.c',
- 'winsys/amdgpu/radv_amdgpu_cs.h',
- 'winsys/amdgpu/radv_amdgpu_surface.c',
- 'winsys/amdgpu/radv_amdgpu_surface.h',
- 'winsys/amdgpu/radv_amdgpu_winsys.c',
- 'winsys/amdgpu/radv_amdgpu_winsys.h',
- 'winsys/amdgpu/radv_amdgpu_winsys_public.h',
- 'radv_cmd_buffer.c',
- 'radv_cs.h',
- 'radv_debug.c',
- 'radv_debug.h',
- 'radv_device.c',
- 'radv_descriptor_set.c',
- 'radv_descriptor_set.h',
- 'radv_formats.c',
- 'radv_image.c',
- 'radv_meta.c',
- 'radv_meta.h',
- 'radv_meta_blit.c',
- 'radv_meta_blit2d.c',
- 'radv_meta_buffer.c',
- 'radv_meta_bufimage.c',
- 'radv_meta_clear.c',
- 'radv_meta_copy.c',
- 'radv_meta_decompress.c',
- 'radv_meta_fast_clear.c',
- 'radv_meta_resolve.c',
- 'radv_meta_resolve_cs.c',
- 'radv_meta_resolve_fs.c',
- 'radv_pass.c',
- 'radv_pipeline.c',
- 'radv_pipeline_cache.c',
- 'radv_private.h',
- 'radv_radeon_winsys.h',
- 'radv_shader.c',
- 'radv_shader.h',
- 'radv_query.c',
- 'radv_util.c',
- 'radv_util.h',
- 'radv_wsi.c',
- 'si_cmd_buffer.c',
- 'vk_format.h',
-)
-
-radv_deps = []
-radv_flags = []
-
-if with_platform_x11
- radv_deps += dep_xcb_dri3
- radv_flags += [
- '-DVK_USE_PLATFORM_XCB_KHR',
- '-DVK_USE_PLATFORM_XLIB_KHR',
- ]
- libradv_files += files('radv_wsi_x11.c')
-endif
-
-if with_platform_wayland
- radv_deps += dep_wayland_client
- radv_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR'
- libradv_files += files('radv_wsi_wayland.c')
-endif
-
-libvulkan_radeon = shared_library(
- 'vulkan_radeon',
- [libradv_files, radv_entrypoints, radv_extensions_c, nir_opcodes_h, vk_format_table_c],
- include_directories : [inc_common, inc_amd, inc_amd_common, inc_compiler,
- inc_vulkan_util, inc_vulkan_wsi],
- link_with : [libamd_common, libamdgpu_addrlib, libvulkan_util,
- libvulkan_wsi, libnir, libmesa_util],
- dependencies : [dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl,
- dep_m, dep_valgrind],
- c_args : [c_vis_args, no_override_init_args, radv_flags],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections],
- install : true,
-)
-
-radv_data = configuration_data()
-radv_data.set('install_libdir', join_paths(get_option('prefix'), get_option('libdir')))
-radv_data.set('libvulkan_radeon_path', libvulkan_radeon.full_path())
-
-configure_file(
- configuration : radv_data,
- input : 'radeon_icd.json.in',
- output : 'radeon_icd. at 0@.json'.format(target_machine.cpu()),
- install_dir : with_vulkan_icd_dir,
-)
-configure_file(
- configuration : radv_data,
- input : 'dev_icd.json.in',
- output : 'dev_icd.json'
-)
diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build
deleted file mode 100644
index 32510cee5ef..00000000000
--- a/src/broadcom/cle/meson.build
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 2017 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 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.
-
-v3d_versions = [
- 21,
- 33
-]
-
-v3d_xml_files = []
-foreach v: v3d_versions
- v3d_xml_files += 'v3d_packet_v at 0@.xml'.format(v)
-endforeach
-
-v3d_xml_h = custom_target(
- 'v3d_xml.h',
- input : ['../../intel/genxml/gen_zipped_file.py', v3d_xml_files],
- output : 'v3d_xml.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-v3d_xml_pack = []
-foreach f : v3d_xml_files
- _name = '@0 at _pack.h'.format(f.split('.')[0])
- _xml = custom_target(
- _name,
- input : ['gen_pack_header.py', f],
- output : _name,
- command : [prog_python2, '@INPUT@'],
- capture : true,
- )
- v3d_xml_pack += _xml
-endforeach
-
-libbroadcom_cle = static_library(
- ['broadcom_cle', v3d_xml_h],
- 'v3d_decoder.c',
- include_directories : [inc_common, inc_broadcom],
- c_args : [c_vis_args, no_override_init_args],
- dependencies : [dep_libdrm, dep_valgrind],
- build_by_default : false,
-)
diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
deleted file mode 100644
index 3c6281956f1..00000000000
--- a/src/broadcom/compiler/meson.build
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2017 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 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.
-
-libbroadcom_compiler_files = files(
- 'nir_to_vir.c',
- 'vir.c',
- 'vir_dump.c',
- 'vir_live_variables.c',
- 'vir_lower_uniforms.c',
- 'vir_opt_copy_propagate.c',
- 'vir_opt_dead_code.c',
- 'vir_register_allocate.c',
- 'vir_to_qpu.c',
- 'qpu_schedule.c',
- 'qpu_validate.c',
- 'v3d_compiler.h',
- 'v3d_nir_lower_io.c',
-)
-
-libbroadcom_compiler = static_library(
- ['broadcom_compiler', v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
- libbroadcom_compiler_files,
- include_directories : [inc_common, inc_broadcom],
- c_args : [c_vis_args, no_override_init_args],
- dependencies : [dep_libdrm, dep_valgrind],
- build_by_default : false,
-)
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
deleted file mode 100644
index dbeee091139..00000000000
--- a/src/broadcom/meson.build
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2017 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 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.
-
-inc_broadcom = include_directories('.', 'cle')
-
-subdir('cle')
-
-if with_gallium_vc5
- subdir('compiler')
- subdir('qpu')
-
- libbroadcom_vc5 = static_library(
- 'libbroadcom_vc5',
- [
- files(
- 'common/v3d_debug.c',
- 'clif/clif_dump.c',
- ),
- v3d_xml_pack,
- ],
- include_directories : [inc_common, inc_broadcom, inc_src],
- c_args : [c_vis_args, no_override_init_args],
- link_whole : [libbroadcom_compiler, libbroadcom_qpu],
- build_by_default : false,
- dependencies: dep_valgrind,
- )
-endif
diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
deleted file mode 100644
index 8178ddbd53b..00000000000
--- a/src/broadcom/qpu/meson.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2017 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 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.
-
-libbroadcom_qpu_files = files(
- 'qpu_disasm.c',
- 'qpu_instr.c',
- 'qpu_pack.c',
-)
-
-libbroadcom_qpu = static_library(
- ['broadcom_qpu', v3d_xml_pack],
- libbroadcom_qpu_files,
- include_directories : [inc_common, inc_broadcom],
- c_args : [c_vis_args, no_override_init_args],
- dependencies : [dep_libdrm, dep_valgrind],
- build_by_default : false,
-)
-
-test('qpu_disasm',
- executable('qpu_disasm', 'tests/qpu_disasm.c',
- link_with: [libbroadcom_qpu, libmesa_util],
- include_directories: inc_common))
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
deleted file mode 100644
index 17ee1a242cd..00000000000
--- a/src/compiler/glsl/glcpp/meson.build
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright © 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 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.
-
-glcpp_parse = custom_target(
- 'glcpp-parse.[ch]',
- input : 'glcpp-parse.y',
- output : ['glcpp-parse.c', 'glcpp-parse.h'],
- command : [prog_bison, '-o', '@OUTPUT0@', '-p', 'glcpp_parser_',
- '--defines=@OUTPUT1@', '@INPUT@'],
-)
-
-glcpp_lex = custom_target(
- 'glcpp-lex.c',
- input : 'glcpp-lex.l',
- output : 'glcpp-lex.c',
- command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
-)
-
-libglcpp = static_library(
- 'glcpp',
- [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
- link_with : libmesa_util,
- include_directories : [inc_common],
- c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- build_by_default : false,
-)
-
-glcpp = executable(
- 'glcpp',
- 'glcpp.c',
- dependencies : [dep_m],
- include_directories : [inc_common],
- link_with : [libglcpp, libglsl_util],
- c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
- build_by_default : false,
-)
-
-# TODO: figure out how to make all of these tests work.
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
deleted file mode 100644
index d1a75eb8c36..00000000000
--- a/src/compiler/glsl/meson.build
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright © 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 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.
-
-subdir('glcpp')
-
-glsl_parser = custom_target(
- 'glsl_parser',
- input : 'glsl_parser.yy',
- output : ['glsl_parser.cpp', 'glsl_parser.h'],
- command : [prog_bison, '-o', '@OUTPUT0@', '-p', '_mesa_glsl_',
- '--defines=@OUTPUT1@', '@INPUT@'],
-)
-
-glsl_lexer_cpp = custom_target(
- 'glsl_lexer_cpp',
- input : 'glsl_lexer.ll',
- output : 'glsl_lexer.cpp',
- command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
-)
-
-ir_expression_operation_constant_h = custom_target(
- 'ir_expression_operation_constant.h',
- input : 'ir_expression_operation.py',
- output : 'ir_expression_operation_constant.h',
- command : [prog_python2, '@INPUT@', 'constant'],
- capture : true,
-)
-
-ir_expression_operation_strings_h = custom_target(
- 'ir_expression_operation_strings.h',
- input : 'ir_expression_operation.py',
- output : 'ir_expression_operation_strings.h',
- command : [prog_python2, '@INPUT@', 'strings'],
- capture : true,
-)
-
-files_libglsl = files(
- 'ast.h',
- 'ast_array_index.cpp',
- 'ast_expr.cpp',
- 'ast_function.cpp',
- 'ast_to_hir.cpp',
- 'ast_type.cpp',
- 'builtin_functions.cpp',
- 'builtin_functions.h',
- 'builtin_int64.h',
- 'builtin_types.cpp',
- 'builtin_variables.cpp',
- 'generate_ir.cpp',
- 'glsl_parser_extras.cpp',
- 'glsl_parser_extras.h',
- 'glsl_symbol_table.cpp',
- 'glsl_symbol_table.h',
- 'glsl_to_nir.cpp',
- 'glsl_to_nir.h',
- 'hir_field_selection.cpp',
- 'ir_array_refcount.cpp',
- 'ir_array_refcount.h',
- 'ir_basic_block.cpp',
- 'ir_basic_block.h',
- 'ir_builder.cpp',
- 'ir_builder.h',
- 'ir_clone.cpp',
- 'ir_constant_expression.cpp',
- 'ir.cpp',
- 'ir.h',
- 'ir_equals.cpp',
- 'ir_expression_flattening.cpp',
- 'ir_expression_flattening.h',
- 'ir_function_can_inline.cpp',
- 'ir_function_detect_recursion.cpp',
- 'ir_function_inlining.h',
- 'ir_function.cpp',
- 'ir_hierarchical_visitor.cpp',
- 'ir_hierarchical_visitor.h',
- 'ir_hv_accept.cpp',
- 'ir_optimization.h',
- 'ir_print_visitor.cpp',
- 'ir_print_visitor.h',
- 'ir_reader.cpp',
- 'ir_reader.h',
- 'ir_rvalue_visitor.cpp',
- 'ir_rvalue_visitor.h',
- 'ir_set_program_inouts.cpp',
- 'ir_uniform.h',
- 'ir_validate.cpp',
- 'ir_variable_refcount.cpp',
- 'ir_variable_refcount.h',
- 'ir_visitor.h',
- 'linker.cpp',
- 'linker.h',
- 'link_atomics.cpp',
- 'link_functions.cpp',
- 'link_interface_blocks.cpp',
- 'link_uniforms.cpp',
- 'link_uniform_initializers.cpp',
- 'link_uniform_block_active_visitor.cpp',
- 'link_uniform_block_active_visitor.h',
- 'link_uniform_blocks.cpp',
- 'link_varyings.cpp',
- 'link_varyings.h',
- 'list.h',
- 'loop_analysis.cpp',
- 'loop_analysis.h',
- 'loop_unroll.cpp',
- 'lower_blend_equation_advanced.cpp',
- 'lower_buffer_access.cpp',
- 'lower_buffer_access.h',
- 'lower_const_arrays_to_uniforms.cpp',
- 'lower_discard.cpp',
- 'lower_discard_flow.cpp',
- 'lower_distance.cpp',
- 'lower_if_to_cond_assign.cpp',
- 'lower_instructions.cpp',
- 'lower_int64.cpp',
- 'lower_jumps.cpp',
- 'lower_mat_op_to_vec.cpp',
- 'lower_noise.cpp',
- 'lower_offset_array.cpp',
- 'lower_packed_varyings.cpp',
- 'lower_named_interface_blocks.cpp',
- 'lower_packing_builtins.cpp',
- 'lower_subroutine.cpp',
- 'lower_tess_level.cpp',
- 'lower_texture_projection.cpp',
- 'lower_variable_index_to_cond_assign.cpp',
- 'lower_vec_index_to_cond_assign.cpp',
- 'lower_vec_index_to_swizzle.cpp',
- 'lower_vector.cpp',
- 'lower_vector_derefs.cpp',
- 'lower_vector_insert.cpp',
- 'lower_vertex_id.cpp',
- 'lower_output_reads.cpp',
- 'lower_shared_reference.cpp',
- 'lower_ubo_reference.cpp',
- 'opt_algebraic.cpp',
- 'opt_array_splitting.cpp',
- 'opt_conditional_discard.cpp',
- 'opt_constant_folding.cpp',
- 'opt_constant_propagation.cpp',
- 'opt_constant_variable.cpp',
- 'opt_copy_propagation.cpp',
- 'opt_copy_propagation_elements.cpp',
- 'opt_dead_builtin_variables.cpp',
- 'opt_dead_builtin_varyings.cpp',
- 'opt_dead_code.cpp',
- 'opt_dead_code_local.cpp',
- 'opt_dead_functions.cpp',
- 'opt_flatten_nested_if_blocks.cpp',
- 'opt_flip_matrices.cpp',
- 'opt_function_inlining.cpp',
- 'opt_if_simplification.cpp',
- 'opt_minmax.cpp',
- 'opt_noop_swizzle.cpp',
- 'opt_rebalance_tree.cpp',
- 'opt_redundant_jumps.cpp',
- 'opt_structure_splitting.cpp',
- 'opt_swizzle_swizzle.cpp',
- 'opt_tree_grafting.cpp',
- 'opt_vectorize.cpp',
- 'program.h',
- 'propagate_invariance.cpp',
- 's_expression.cpp',
- 's_expression.h',
- 'string_to_uint_map.cpp',
- 'string_to_uint_map.h',
- 'shader_cache.cpp',
- 'shader_cache.h',
-)
-
-files_libglsl_standalone = files(
- 'ir_builder_print_visitor.cpp',
- 'ir_builder_print_visitor.h',
- 'opt_add_neg_to_sub.h',
- 'standalone_scaffolding.cpp',
- 'standalone_scaffolding.h',
- 'standalone.cpp',
- 'standalone.h',
-)
-
-libglsl = static_library(
- 'glsl',
- [files_libglsl, glsl_parser, glsl_lexer_cpp, ir_expression_operation_h,
- ir_expression_operation_strings_h, ir_expression_operation_constant_h],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- link_with : [libnir, libglcpp],
- include_directories : [inc_common, inc_compiler, inc_nir],
- build_by_default : false,
-)
-
-libglsl_standalone = static_library(
- 'glsl_standalone',
- [files_libglsl_standalone, ir_expression_operation_h],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common],
- link_with : [libglsl, libglsl_util, libmesa_util],
- dependencies : [dep_thread],
- build_by_default : false,
-)
-
-glsl_compiler = executable(
- 'glsl_compiler',
- 'main.cpp',
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- dependencies : [dep_clock],
- include_directories : [inc_common],
- link_with : [libglsl_standalone],
- build_by_default : false,
-)
-
-glsl_test = executable(
- 'glsl_test',
- ['test.cpp', 'test_optpass.cpp', 'test_optpass.h',
- ir_expression_operation_h],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common],
- dependencies : [dep_clock, dep_thread],
- link_with : [libglsl, libglsl_standalone, libglsl_util],
- build_by_default : false,
-)
-
-if with_tests
- subdir('tests')
-endif
diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build
deleted file mode 100644
index 27f34075b4b..00000000000
--- a/src/compiler/glsl/tests/meson.build
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright © 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 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.
-
-glsl_blob_test = executable(
- 'blob_test',
- 'blob_test.c',
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- include_directories : [inc_common, inc_compiler],
- link_with : [libglsl],
-)
-
-glsl_cache_test = executable(
- 'cache_test',
- 'cache_test.c',
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- include_directories : [inc_common, inc_glsl],
- link_with : [libglsl],
- dependencies : [dep_clock, dep_thread],
-)
-
-glsl_general_ir_test = executable(
- 'general_ir_test',
- ['array_refcount_test.cpp', 'builtin_variable_test.cpp',
- 'invalidate_locations_test.cpp', 'general_ir_test.cpp',
- 'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp', 'varyings_test.cpp',
- ir_expression_operation_h],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common, inc_glsl],
- link_with : [libglsl, libglsl_standalone, libglsl_util],
- dependencies : [dep_clock, dep_thread, idep_gtest],
-)
-
-glsl_uniform_initializer_test = executable(
- 'uniform_initializer_test',
- ['copy_constant_to_storage_tests.cpp', 'set_uniform_initializer_tests.cpp',
- 'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
- ir_expression_operation_h],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common, inc_glsl],
- link_with : [libglsl, libglsl_util],
- dependencies : [dep_thread, idep_gtest],
-)
-
-glsl_sampler_types_test = executable(
- 'sampler_types_test',
- ['sampler_types_test.cpp', ir_expression_operation_h],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common, inc_glsl],
- link_with : [libglsl, libglsl_util],
- dependencies : [dep_thread, idep_gtest],
-)
-
-test('blob_test', glsl_blob_test)
-test('cache_test', glsl_cache_test)
-test('general_ir_test', glsl_general_ir_test)
-test('uniform_initializer_test', glsl_uniform_initializer_test)
-test('sampler_types_test', glsl_sampler_types_test)
-
-# TODO: figure out how to get the shell based tests to work?
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
deleted file mode 100644
index 783be11c926..00000000000
--- a/src/compiler/meson.build
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright © 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 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.
-
-inc_compiler = include_directories('.')
-inc_nir = include_directories('nir')
-inc_glsl = include_directories('glsl')
-
-files_libcompiler = files(
- 'blob.c',
- 'blob.h',
- 'builtin_type_macros.h',
- 'glsl_types.cpp',
- 'glsl_types.h',
- 'nir_types.cpp',
- 'nir_types.h',
- 'shader_enums.c',
- 'shader_enums.h',
- 'shader_info.h',
-)
-
-ir_expression_operation_h = custom_target(
- 'ir_expression_operation.h',
- input : 'glsl/ir_expression_operation.py',
- output : 'ir_expression_operation.h',
- command : [prog_python2, '@INPUT@', 'enum'],
- capture : true,
-)
-
-libcompiler = static_library(
- 'compiler',
- [files_libcompiler, ir_expression_operation_h],
- include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- dependencies : [dep_valgrind],
- build_by_default : false,
-)
-
-subdir('nir')
-
-spirv2nir = executable(
- 'spirv2nir',
- [files('spirv/spirv2nir.c'), dummy_cpp],
- dependencies : [dep_m, dep_thread],
- include_directories : [inc_common, inc_nir, include_directories('spirv')],
- link_with : [libnir, libmesa_util],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- build_by_default : false,
-)
-
-subdir('glsl')
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
deleted file mode 100644
index 144cf01d2c4..00000000000
--- a/src/compiler/nir/meson.build
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright © 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 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.
-
-nir_depends = files('nir_opcodes.py')
-
-nir_builder_opcodes_h = custom_target(
- 'nir_builder_opcodes.h',
- input : 'nir_builder_opcodes_h.py',
- output : 'nir_builder_opcodes.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
- depend_files : nir_depends,
-)
-
-nir_constant_expressions_c = custom_target(
- 'nir_constant_expressions.c',
- input : 'nir_constant_expressions.py',
- output : 'nir_constant_expressions.c',
- command : [prog_python2, '@INPUT@'],
- capture : true,
- depend_files : nir_depends,
-)
-
-nir_opcodes_h = custom_target(
- 'nir_opcodes.h',
- input : 'nir_opcodes_h.py',
- output : 'nir_opcodes.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
- depend_files : nir_depends,
-)
-
-nir_opcodes_c = custom_target(
- 'nir_opcodes.c',
- input : 'nir_opcodes_c.py',
- output : 'nir_opcodes.c',
- command : [prog_python2, '@INPUT@'],
- capture : true,
- depend_files : nir_depends,
-)
-
-nir_opt_algebraic_c = custom_target(
- 'nir_opt_algebraic.c',
- input : 'nir_opt_algebraic.py',
- output : 'nir_opt_algebraic.c',
- command : [prog_python2, '@INPUT@'],
- capture : true,
- depend_files : files('nir_algebraic.py'),
-)
-
-spirv_info_c = custom_target(
- 'spirv_info.c',
- input : files('../spirv/spirv_info_c.py', '../spirv/spirv.core.grammar.json'),
- output : 'spirv_info.c',
- command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'],
-)
-
-files_libnir = files(
- 'nir.c',
- 'nir.h',
- 'nir_builder.h',
- 'nir_clone.c',
- 'nir_constant_expressions.h',
- 'nir_control_flow.c',
- 'nir_control_flow.h',
- 'nir_control_flow_private.h',
- 'nir_dominance.c',
- 'nir_from_ssa.c',
- 'nir_gather_info.c',
- 'nir_gs_count_vertices.c',
- 'nir_inline_functions.c',
- 'nir_instr_set.c',
- 'nir_instr_set.h',
- 'nir_intrinsics.c',
- 'nir_intrinsics.h',
- 'nir_linking_helpers.c',
- 'nir_liveness.c',
- 'nir_loop_analyze.c',
- 'nir_loop_analyze.h',
- 'nir_lower_64bit_packing.c',
- 'nir_lower_alu_to_scalar.c',
- 'nir_lower_alpha_test.c',
- 'nir_lower_atomics.c',
- 'nir_lower_atomics_to_ssbo.c',
- 'nir_lower_bitmap.c',
- 'nir_lower_clamp_color_outputs.c',
- 'nir_lower_clip.c',
- 'nir_lower_clip_cull_distance_arrays.c',
- 'nir_lower_constant_initializers.c',
- 'nir_lower_double_ops.c',
- 'nir_lower_drawpixels.c',
- 'nir_lower_global_vars_to_local.c',
- 'nir_lower_gs_intrinsics.c',
- 'nir_lower_load_const_to_scalar.c',
- 'nir_lower_locals_to_regs.c',
- 'nir_lower_idiv.c',
- 'nir_lower_indirect_derefs.c',
- 'nir_lower_int64.c',
- 'nir_lower_io.c',
- 'nir_lower_io_to_temporaries.c',
- 'nir_lower_io_to_scalar.c',
- 'nir_lower_io_types.c',
- 'nir_lower_passthrough_edgeflags.c',
- 'nir_lower_patch_vertices.c',
- 'nir_lower_phis_to_scalar.c',
- 'nir_lower_read_invocation_to_scalar.c',
- 'nir_lower_regs_to_ssa.c',
- 'nir_lower_returns.c',
- 'nir_lower_samplers.c',
- 'nir_lower_samplers_as_deref.c',
- 'nir_lower_system_values.c',
- 'nir_lower_tex.c',
- 'nir_lower_to_source_mods.c',
- 'nir_lower_two_sided_color.c',
- 'nir_lower_uniforms_to_ubo.c',
- 'nir_lower_vars_to_ssa.c',
- 'nir_lower_var_copies.c',
- 'nir_lower_vec_to_movs.c',
- 'nir_lower_wpos_center.c',
- 'nir_lower_wpos_ytransform.c',
- 'nir_metadata.c',
- 'nir_move_vec_src_uses_to_dest.c',
- 'nir_normalize_cubemap_coords.c',
- 'nir_opt_conditional_discard.c',
- 'nir_opt_constant_folding.c',
- 'nir_opt_copy_prop_vars.c',
- 'nir_opt_copy_propagate.c',
- 'nir_opt_cse.c',
- 'nir_opt_dce.c',
- 'nir_opt_dead_cf.c',
- 'nir_opt_gcm.c',
- 'nir_opt_global_to_local.c',
- 'nir_opt_if.c',
- 'nir_opt_intrinsics.c',
- 'nir_opt_loop_unroll.c',
- 'nir_opt_move_comparisons.c',
- 'nir_opt_peephole_select.c',
- 'nir_opt_remove_phis.c',
- 'nir_opt_trivial_continues.c',
- 'nir_opt_undef.c',
- 'nir_phi_builder.c',
- 'nir_phi_builder.h',
- 'nir_print.c',
- 'nir_propagate_invariant.c',
- 'nir_remove_dead_variables.c',
- 'nir_repair_ssa.c',
- 'nir_search.c',
- 'nir_search.h',
- 'nir_search_helpers.h',
- 'nir_split_var_copies.c',
- 'nir_sweep.c',
- 'nir_to_lcssa.c',
- 'nir_validate.c',
- 'nir_vla.h',
- 'nir_worklist.c',
- 'nir_worklist.h',
- '../spirv/GLSL.std.450.h',
- '../spirv/nir_spirv.h',
- '../spirv/spirv.h',
- '../spirv/spirv_info.h',
- '../spirv/spirv_to_nir.c',
- '../spirv/vtn_alu.c',
- '../spirv/vtn_cfg.c',
- '../spirv/vtn_glsl450.c',
- '../spirv/vtn_private.h',
- '../spirv/vtn_variables.c',
-)
-
-libnir = static_library(
- 'nir',
- [files_libnir, spirv_info_c, nir_opt_algebraic_c, nir_opcodes_c,
- nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h],
- include_directories : [inc_common, inc_compiler, include_directories('../spirv')],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- link_with : libcompiler,
- build_by_default : false,
-)
-
-if with_tests
- nir_control_flow_test = executable(
- 'nir_control_flow_test',
- [files('tests/control_flow_tests.cpp'), nir_opcodes_h],
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
- include_directories : [inc_common],
- dependencies : [dep_thread, idep_gtest],
- link_with : [libmesa_util, libnir],
- )
-
- test('nir_control_flow', nir_control_flow_test)
-endif
diff --git a/src/egl/meson.build b/src/egl/meson.build
deleted file mode 100644
index 8ea8a5bbb69..00000000000
--- a/src/egl/meson.build
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright © 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 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.
-
-c_args_for_egl = []
-link_for_egl = []
-deps_for_egl = []
-incs_for_egl = []
-files_egl = files(
- 'main/eglapi.c',
- 'main/eglapi.h',
- 'main/eglarray.c',
- 'main/eglarray.h',
- 'main/eglconfig.c',
- 'main/eglconfig.h',
- 'main/eglcontext.c',
- 'main/eglcontext.h',
- 'main/eglcurrent.c',
- 'main/eglcurrent.h',
- 'main/egldefines.h',
- 'main/egldisplay.c',
- 'main/egldisplay.h',
- 'main/egldriver.c',
- 'main/egldriver.h',
- 'main/eglfallbacks.c',
- 'main/eglglobals.c',
- 'main/eglglobals.h',
- 'main/eglimage.c',
- 'main/eglimage.h',
- 'main/egllog.c',
- 'main/egllog.h',
- 'main/eglsurface.c',
- 'main/eglsurface.h',
- 'main/eglsync.c',
- 'main/eglsync.h',
- 'main/eglentrypoint.h',
- 'main/egltypedefs.h',
- 'drivers/dri2/egl_dri2.c',
- 'drivers/dri2/egl_dri2.h',
- 'drivers/dri2/egl_dri2_fallbacks.h',
-)
-
-linux_dmabuf_unstable_v1_protocol_c = custom_target(
- 'linux-dmabuf-unstable-v1-protocol.c',
- input : wayland_dmabuf_xml,
- output : 'linux-dmabuf-unstable-v1-protocol.c',
- command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
-)
-
-linux_dmabuf_unstable_v1_client_protocol_h = custom_target(
- 'linux-dmabuf-unstable-v1-client-protocol.h',
- input : wayland_dmabuf_xml,
- output : 'linux-dmabuf-unstable-v1-client-protocol.h',
- command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
-)
-
-g_egldispatchstubs_c = custom_target(
- 'g_egldispatchstubs.c',
- input : [
- 'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py',
- 'generate/egl.xml', 'generate/egl_other.xml'
- ],
- output : 'g_egldispatchstubs.c',
- command : [
- prog_python2, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@'
- ],
- depend_files : files('generate/genCommon.py'),
- capture : true,
-)
-
-g_egldispatchstubs_h = custom_target(
- 'g_egldispatchstubs.h',
- input : [
- 'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py',
- 'generate/egl.xml', 'generate/egl_other.xml'
- ],
- output : 'g_egldispatchstubs.h',
- command : [
- prog_python2, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@'
- ],
- depend_files : files('generate/genCommon.py'),
- capture : true,
-)
-
-if with_platform_x11
- files_egl += files('drivers/dri2/platform_x11.c')
- if with_dri3
- files_egl += files('drivers/dri2/platform_x11_dri3.c')
- link_for_egl += libloader_dri3_helper
- endif
- deps_for_egl += [dep_xcb_dri2, dep_xcb_xfixes]
-endif
-if with_platform_drm
- files_egl += files('drivers/dri2/platform_drm.c')
- link_for_egl += libgbm
- incs_for_egl += include_directories('../gbm/main')
-endif
-if with_platform_surfaceless
- files_egl += files('drivers/dri2/platform_surfaceless.c')
-endif
-if with_platform_wayland
- deps_for_egl += [dep_wayland_client, dep_wayland_server]
- link_for_egl += libwayland_drm
- files_egl += files('drivers/dri2/platform_wayland.c')
- files_egl += [
- linux_dmabuf_unstable_v1_protocol_c,
- linux_dmabuf_unstable_v1_client_protocol_h,
- wayland_drm_client_protocol_h,
- ]
- incs_for_egl += include_directories(
- 'wayland/wayland-egl', 'wayland/wayland-drm',
- )
-endif
-# TODO: android
-
-# TODO: glvnd
-
-if cc.has_function('mincore')
- c_args_for_egl += '-DHAVE_MINCORE'
-endif
-
-if not with_glvnd
- egl_lib_name = 'EGL'
- egl_lib_version = '1.0.0'
-else
- egl_lib_name = 'EGL_mesa'
- egl_lib_version = '0'
- files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
- files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c')
- install_data(
- 'main/50_mesa.json',
- install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d')
- )
-endif
-
-libegl = shared_library(
- egl_lib_name,
- files_egl,
- c_args : [
- c_vis_args,
- c_args_for_egl,
- '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir),
- '-D_EGL_BUILT_IN_DRIVER_DRI2',
- '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ at 0@'.format(egl_native_platform.to_upper()),
- ],
- include_directories : [
- incs_for_egl, inc_include, inc_src, inc_loader, inc_gbm,
- include_directories('main'),
- ],
- link_with : [link_for_egl, libloader, libxmlconfig, libglapi, libmesa_util],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections],
- dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],
- install : true,
- version : egl_lib_version,
-)
-
-pkg.generate(
- name : 'egl',
- description : 'Mesa EGL Library',
- version : meson.project_version(),
- libraries : libegl,
- libraries_private: gl_priv_libs,
- requires_private : gl_priv_reqs,
- extra_cflags : gl_pkgconfig_c_flags,
-)
-
-if with_tests
- test('egl-symbols-check', find_program('egl-symbols-check'))
- test('egl-entrypoint-check', find_program('egl-entrypoint-check'))
-endif
diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
deleted file mode 100644
index 12b49ca4f06..00000000000
--- a/src/egl/wayland/wayland-drm/meson.build
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 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 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.
-
-wayland_drm_protocol_c = custom_target(
- 'wayland-drm-protocol.c',
- input : 'wayland-drm.xml',
- output : 'wayland-drm-protocol.c',
- command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
-)
-
-wayland_drm_client_protocol_h = custom_target(
- 'wayland-drm-client-protocol.h',
- input : 'wayland-drm.xml',
- output : 'wayland-drm-client-protocol.h',
- command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
-)
-
-wayland_drm_server_protocol_h = custom_target(
- 'wayland-drm-server-protocol.h',
- input : 'wayland-drm.xml',
- output : 'wayland-drm-server-protocol.h',
- command : [prog_wl_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
-)
-
-libwayland_drm = static_library(
- 'wayland_drm',
- ['wayland-drm.c', wayland_drm_protocol_c, wayland_drm_server_protocol_h],
- dependencies : [dep_wayland_server],
- build_by_default : false,
-)
diff --git a/src/egl/wayland/wayland-egl/meson.build b/src/egl/wayland/wayland-egl/meson.build
deleted file mode 100644
index 5e7c3103843..00000000000
--- a/src/egl/wayland/wayland-egl/meson.build
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright © 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 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.
-
-
-libwayland_egl = shared_library(
- 'wayland-egl',
- 'wayland-egl.c',
- c_args : [c_vis_args],
- link_args : ld_args_gc_sections,
- version : '1.0.0',
- install : true,
-)
-
-pkg.generate(
- name : 'wayland-egl',
- description : 'Mesa wayland-egl library',
- libraries : libwayland_egl,
- version : meson.project_version(),
- requires : 'wayland-client',
-)
-
-if with_tests
- test('wayland-egl-symbols-check', find_program('wayland-egl-symbols-check'))
- test('wayland-egl-abi-check', executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c'))
-endif
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
deleted file mode 100644
index 778b4ce4ac2..00000000000
--- a/src/gallium/auxiliary/meson.build
+++ /dev/null
@@ -1,530 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-inc_gallium_aux = include_directories('.')
-
-files_libgallium = files(
- 'cso_cache/cso_cache.c',
- 'cso_cache/cso_cache.h',
- 'cso_cache/cso_context.c',
- 'cso_cache/cso_context.h',
- 'cso_cache/cso_hash.c',
- 'cso_cache/cso_hash.h',
- 'draw/draw_cliptest_tmp.h',
- 'draw/draw_context.c',
- 'draw/draw_context.h',
- 'draw/draw_decompose_tmp.h',
- 'draw/draw_fs.c',
- 'draw/draw_fs.h',
- 'draw/draw_gs.c',
- 'draw/draw_gs.h',
- 'draw/draw_gs_tmp.h',
- 'draw/draw_pipe_aaline.c',
- 'draw/draw_pipe_aapoint.c',
- 'draw/draw_pipe.c',
- 'draw/draw_pipe.h',
- 'draw/draw_pipe_clip.c',
- 'draw/draw_pipe_cull.c',
- 'draw/draw_pipe_flatshade.c',
- 'draw/draw_pipe_offset.c',
- 'draw/draw_pipe_pstipple.c',
- 'draw/draw_pipe_stipple.c',
- 'draw/draw_pipe_twoside.c',
- 'draw/draw_pipe_unfilled.c',
- 'draw/draw_pipe_util.c',
- 'draw/draw_pipe_validate.c',
- 'draw/draw_pipe_vbuf.c',
- 'draw/draw_pipe_wide_line.c',
- 'draw/draw_pipe_wide_point.c',
- 'draw/draw_prim_assembler.c',
- 'draw/draw_prim_assembler.h',
- 'draw/draw_prim_assembler_tmp.h',
- 'draw/draw_private.h',
- 'draw/draw_pt.c',
- 'draw/draw_pt_decompose.h',
- 'draw/draw_pt_emit.c',
- 'draw/draw_pt_fetch.c',
- 'draw/draw_pt_fetch_emit.c',
- 'draw/draw_pt_fetch_shade_emit.c',
- 'draw/draw_pt_fetch_shade_pipeline.c',
- 'draw/draw_pt.h',
- 'draw/draw_pt_post_vs.c',
- 'draw/draw_pt_so_emit.c',
- 'draw/draw_pt_util.c',
- 'draw/draw_pt_vsplit.c',
- 'draw/draw_pt_vsplit_tmp.h',
- 'draw/draw_so_emit_tmp.h',
- 'draw/draw_split_tmp.h',
- 'draw/draw_vbuf.h',
- 'draw/draw_vertex.c',
- 'draw/draw_vertex.h',
- 'draw/draw_vs.c',
- 'draw/draw_vs_exec.c',
- 'draw/draw_vs.h',
- 'draw/draw_vs_variant.c',
- 'hud/font.c',
- 'hud/font.h',
- 'hud/hud_context.c',
- 'hud/hud_context.h',
- 'hud/hud_cpu.c',
- 'hud/hud_nic.c',
- 'hud/hud_cpufreq.c',
- 'hud/hud_diskstat.c',
- 'hud/hud_sensors_temp.c',
- 'hud/hud_driver_query.c',
- 'hud/hud_fps.c',
- 'hud/hud_private.h',
- 'indices/u_indices.h',
- 'indices/u_indices_priv.h',
- 'indices/u_primconvert.c',
- 'indices/u_primconvert.h',
- 'os/os_memory_aligned.h',
- 'os/os_memory_debug.h',
- 'os/os_memory_stdc.h',
- 'os/os_memory.h',
- 'os/os_misc.c',
- 'os/os_misc.h',
- 'os/os_mman.h',
- 'os/os_process.c',
- 'os/os_process.h',
- 'os/os_thread.h',
- 'os/os_time.c',
- 'os/os_time.h',
- 'pipebuffer/pb_buffer_fenced.c',
- 'pipebuffer/pb_buffer_fenced.h',
- 'pipebuffer/pb_buffer.h',
- 'pipebuffer/pb_buffer_malloc.c',
- 'pipebuffer/pb_bufmgr_alt.c',
- 'pipebuffer/pb_bufmgr_cache.c',
- 'pipebuffer/pb_bufmgr_debug.c',
- 'pipebuffer/pb_bufmgr.h',
- 'pipebuffer/pb_bufmgr_mm.c',
- 'pipebuffer/pb_bufmgr_ondemand.c',
- 'pipebuffer/pb_bufmgr_pool.c',
- 'pipebuffer/pb_bufmgr_slab.c',
- 'pipebuffer/pb_cache.c',
- 'pipebuffer/pb_cache.h',
- 'pipebuffer/pb_slab.c',
- 'pipebuffer/pb_slab.h',
- 'pipebuffer/pb_validate.c',
- 'pipebuffer/pb_validate.h',
- 'postprocess/filters.h',
- 'postprocess/postprocess.h',
- 'postprocess/pp_celshade.c',
- 'postprocess/pp_celshade.h',
- 'postprocess/pp_colors.c',
- 'postprocess/pp_colors.h',
- 'postprocess/pp_filters.h',
- 'postprocess/pp_init.c',
- 'postprocess/pp_mlaa_areamap.h',
- 'postprocess/pp_mlaa.c',
- 'postprocess/pp_mlaa.h',
- 'postprocess/pp_private.h',
- 'postprocess/pp_program.c',
- 'postprocess/pp_run.c',
- 'rbug/rbug_connection.c',
- 'rbug/rbug_connection.h',
- 'rbug/rbug_context.c',
- 'rbug/rbug_context.h',
- 'rbug/rbug_core.c',
- 'rbug/rbug_core.h',
- 'rbug/rbug_demarshal.c',
- 'rbug/rbug.h',
- 'rbug/rbug_internal.h',
- 'rbug/rbug_proto.h',
- 'rbug/rbug_shader.c',
- 'rbug/rbug_shader.h',
- 'rbug/rbug_texture.c',
- 'rbug/rbug_texture.h',
- 'rtasm/rtasm_cpu.c',
- 'rtasm/rtasm_cpu.h',
- 'rtasm/rtasm_execmem.c',
- 'rtasm/rtasm_execmem.h',
- 'rtasm/rtasm_x86sse.c',
- 'rtasm/rtasm_x86sse.h',
- 'tgsi/tgsi_aa_point.c',
- 'tgsi/tgsi_aa_point.h',
- 'tgsi/tgsi_build.c',
- 'tgsi/tgsi_build.h',
- 'tgsi/tgsi_dump.c',
- 'tgsi/tgsi_dump.h',
- 'tgsi/tgsi_exec.c',
- 'tgsi/tgsi_exec.h',
- 'tgsi/tgsi_emulate.c',
- 'tgsi/tgsi_emulate.h',
- 'tgsi/tgsi_from_mesa.c',
- 'tgsi/tgsi_from_mesa.h',
- 'tgsi/tgsi_info.c',
- 'tgsi/tgsi_info.h',
- 'tgsi/tgsi_info_opcodes.h',
- 'tgsi/tgsi_iterate.c',
- 'tgsi/tgsi_iterate.h',
- 'tgsi/tgsi_lowering.c',
- 'tgsi/tgsi_lowering.h',
- 'tgsi/tgsi_opcode_tmp.h',
- 'tgsi/tgsi_parse.c',
- 'tgsi/tgsi_parse.h',
- 'tgsi/tgsi_point_sprite.c',
- 'tgsi/tgsi_point_sprite.h',
- 'tgsi/tgsi_sanity.c',
- 'tgsi/tgsi_sanity.h',
- 'tgsi/tgsi_scan.c',
- 'tgsi/tgsi_scan.h',
- 'tgsi/tgsi_strings.c',
- 'tgsi/tgsi_strings.h',
- 'tgsi/tgsi_text.c',
- 'tgsi/tgsi_text.h',
- 'tgsi/tgsi_transform.c',
- 'tgsi/tgsi_transform.h',
- 'tgsi/tgsi_two_side.c',
- 'tgsi/tgsi_two_side.h',
- 'tgsi/tgsi_ureg.c',
- 'tgsi/tgsi_ureg.h',
- 'tgsi/tgsi_util.c',
- 'tgsi/tgsi_util.h',
- 'translate/translate.c',
- 'translate/translate.h',
- 'translate/translate_cache.c',
- 'translate/translate_cache.h',
- 'translate/translate_generic.c',
- 'translate/translate_sse.c',
- 'util/dbghelp.h',
- 'util/u_bitcast.h',
- 'util/u_bitmask.c',
- 'util/u_bitmask.h',
- 'util/u_blend.h',
- 'util/u_blit.c',
- 'util/u_blit.h',
- 'util/u_blitter.c',
- 'util/u_blitter.h',
- 'util/u_box.h',
- 'util/u_cache.c',
- 'util/u_cache.h',
- 'util/u_cpu_detect.c',
- 'util/u_cpu_detect.h',
- 'util/u_debug.c',
- 'util/u_debug.h',
- 'util/u_debug_describe.c',
- 'util/u_debug_describe.h',
- 'util/u_debug_flush.c',
- 'util/u_debug_flush.h',
- 'util/u_debug_image.c',
- 'util/u_debug_image.h',
- 'util/u_debug_memory.c',
- 'util/u_debug_refcnt.c',
- 'util/u_debug_refcnt.h',
- 'util/u_debug_stack.c',
- 'util/u_debug_stack.h',
- 'util/u_debug_symbol.c',
- 'util/u_debug_symbol.h',
- 'util/u_dirty_flags.h',
- 'util/u_dirty_surfaces.h',
- 'util/u_dl.c',
- 'util/u_dl.h',
- 'util/u_draw.c',
- 'util/u_draw.h',
- 'util/u_draw_quad.c',
- 'util/u_draw_quad.h',
- 'util/u_dual_blend.h',
- 'util/u_dump_defines.c',
- 'util/u_dump.h',
- 'util/u_dump_state.c',
- 'util/u_fifo.h',
- 'util/u_format.c',
- 'util/u_format.h',
- 'util/u_format_etc.c',
- 'util/u_format_etc.h',
- 'util/u_format_latc.c',
- 'util/u_format_latc.h',
- 'util/u_format_other.c',
- 'util/u_format_other.h',
- 'util/u_format_rgtc.c',
- 'util/u_format_rgtc.h',
- 'util/u_format_s3tc.c',
- 'util/u_format_s3tc.h',
- 'util/u_format_tests.c',
- 'util/u_format_tests.h',
- 'util/u_format_yuv.c',
- 'util/u_format_yuv.h',
- 'util/u_format_zs.c',
- 'util/u_format_zs.h',
- 'util/u_framebuffer.c',
- 'util/u_framebuffer.h',
- 'util/u_gen_mipmap.c',
- 'util/u_gen_mipmap.h',
- 'util/u_half.h',
- 'util/u_handle_table.c',
- 'util/u_handle_table.h',
- 'util/u_hash_table.c',
- 'util/u_hash_table.h',
- 'util/u_helpers.c',
- 'util/u_helpers.h',
- 'util/u_idalloc.c',
- 'util/u_idalloc.h',
- 'util/u_index_modify.c',
- 'util/u_index_modify.h',
- 'util/u_inlines.h',
- 'util/u_linear.c',
- 'util/u_linear.h',
- 'util/u_log.c',
- 'util/u_log.h',
- 'util/u_math.c',
- 'util/u_math.h',
- 'util/u_memory.h',
- 'util/u_mm.c',
- 'util/u_mm.h',
- 'util/u_network.c',
- 'util/u_network.h',
- 'util/u_pack_color.h',
- 'util/u_pointer.h',
- 'util/u_prim.h',
- 'util/u_prim_restart.c',
- 'util/u_prim_restart.h',
- 'util/u_pstipple.c',
- 'util/u_pstipple.h',
- 'util/u_pwr8.h',
- 'util/u_range.h',
- 'util/u_rect.h',
- 'util/u_resource.c',
- 'util/u_resource.h',
- 'util/u_ringbuffer.c',
- 'util/u_ringbuffer.h',
- 'util/u_sampler.c',
- 'util/u_sampler.h',
- 'util/u_simple_shaders.c',
- 'util/u_simple_shaders.h',
- 'util/u_split_prim.h',
- 'util/u_sse.h',
- 'util/u_suballoc.c',
- 'util/u_suballoc.h',
- 'util/u_surface.c',
- 'util/u_surface.h',
- 'util/u_surfaces.c',
- 'util/u_surfaces.h',
- 'util/u_tests.c',
- 'util/u_tests.h',
- 'util/u_texture.c',
- 'util/u_texture.h',
- 'util/u_tile.c',
- 'util/u_tile.h',
- 'util/u_time.h',
- 'util/u_transfer.c',
- 'util/u_transfer.h',
- 'util/u_threaded_context.c',
- 'util/u_threaded_context.h',
- 'util/u_threaded_context_calls.h',
- 'util/u_upload_mgr.c',
- 'util/u_upload_mgr.h',
- 'util/u_vbuf.c',
- 'util/u_vbuf.h',
- 'util/u_video.h',
- 'util/u_viewport.h',
- 'nir/tgsi_to_nir.c',
- 'nir/tgsi_to_nir.h',
-)
-
-if dep_libdrm != [] and dep_libdrm.found()
- files_libgallium += files(
- 'renderonly/renderonly.c',
- 'renderonly/renderonly.h',
- )
-endif
-
-if with_llvm
- files_libgallium += files(
- 'gallivm/lp_bld_arit.c',
- 'gallivm/lp_bld_arit.h',
- 'gallivm/lp_bld_arit_overflow.c',
- 'gallivm/lp_bld_arit_overflow.h',
- 'gallivm/lp_bld_assert.c',
- 'gallivm/lp_bld_assert.h',
- 'gallivm/lp_bld_bitarit.c',
- 'gallivm/lp_bld_bitarit.h',
- 'gallivm/lp_bld_const.c',
- 'gallivm/lp_bld_const.h',
- 'gallivm/lp_bld_conv.c',
- 'gallivm/lp_bld_conv.h',
- 'gallivm/lp_bld_debug.cpp',
- 'gallivm/lp_bld_debug.h',
- 'gallivm/lp_bld_flow.c',
- 'gallivm/lp_bld_flow.h',
- 'gallivm/lp_bld_format_aos_array.c',
- 'gallivm/lp_bld_format_aos.c',
- 'gallivm/lp_bld_format_cached.c',
- 'gallivm/lp_bld_format_float.c',
- 'gallivm/lp_bld_format.c',
- 'gallivm/lp_bld_format.h',
- 'gallivm/lp_bld_format_soa.c',
- 'gallivm/lp_bld_format_srgb.c',
- 'gallivm/lp_bld_format_yuv.c',
- 'gallivm/lp_bld_gather.c',
- 'gallivm/lp_bld_gather.h',
- 'gallivm/lp_bld.h',
- 'gallivm/lp_bld_init.c',
- 'gallivm/lp_bld_init.h',
- 'gallivm/lp_bld_intr.c',
- 'gallivm/lp_bld_intr.h',
- 'gallivm/lp_bld_limits.h',
- 'gallivm/lp_bld_logic.c',
- 'gallivm/lp_bld_logic.h',
- 'gallivm/lp_bld_misc.cpp',
- 'gallivm/lp_bld_misc.h',
- 'gallivm/lp_bld_pack.c',
- 'gallivm/lp_bld_pack.h',
- 'gallivm/lp_bld_printf.c',
- 'gallivm/lp_bld_printf.h',
- 'gallivm/lp_bld_quad.c',
- 'gallivm/lp_bld_quad.h',
- 'gallivm/lp_bld_sample_aos.c',
- 'gallivm/lp_bld_sample_aos.h',
- 'gallivm/lp_bld_sample.c',
- 'gallivm/lp_bld_sample.h',
- 'gallivm/lp_bld_sample_soa.c',
- 'gallivm/lp_bld_struct.c',
- 'gallivm/lp_bld_struct.h',
- 'gallivm/lp_bld_swizzle.c',
- 'gallivm/lp_bld_swizzle.h',
- 'gallivm/lp_bld_tgsi_action.c',
- 'gallivm/lp_bld_tgsi_action.h',
- 'gallivm/lp_bld_tgsi_aos.c',
- 'gallivm/lp_bld_tgsi.c',
- 'gallivm/lp_bld_tgsi.h',
- 'gallivm/lp_bld_tgsi_info.c',
- 'gallivm/lp_bld_tgsi_soa.c',
- 'gallivm/lp_bld_type.c',
- 'gallivm/lp_bld_type.h',
- 'draw/draw_llvm.c',
- 'draw/draw_llvm.h',
- 'draw/draw_llvm_sample.c',
- 'draw/draw_pt_fetch_shade_pipeline_llvm.c',
- 'draw/draw_vs_llvm.c',
- )
-endif
-
-files_libgalliumvl = files(
- 'vl/vl_bicubic_filter.c',
- 'vl/vl_bicubic_filter.h',
- 'vl/vl_compositor.c',
- 'vl/vl_compositor.h',
- 'vl/vl_csc.c',
- 'vl/vl_csc.h',
- 'vl/vl_decoder.c',
- 'vl/vl_decoder.h',
- 'vl/vl_defines.h',
- 'vl/vl_deint_filter.c',
- 'vl/vl_deint_filter.h',
- 'vl/vl_idct.c',
- 'vl/vl_idct.h',
- 'vl/vl_matrix_filter.c',
- 'vl/vl_matrix_filter.h',
- 'vl/vl_mc.c',
- 'vl/vl_mc.h',
- 'vl/vl_median_filter.c',
- 'vl/vl_median_filter.h',
- 'vl/vl_mpeg12_bitstream.c',
- 'vl/vl_mpeg12_bitstream.h',
- 'vl/vl_mpeg12_decoder.c',
- 'vl/vl_mpeg12_decoder.h',
- 'vl/vl_rbsp.h',
- 'vl/vl_types.h',
- 'vl/vl_vertex_buffers.c',
- 'vl/vl_vertex_buffers.h',
- 'vl/vl_video_buffer.c',
- 'vl/vl_video_buffer.h',
- 'vl/vl_vlc.h',
- 'vl/vl_zscan.c',
- 'vl/vl_zscan.h',
-)
-
-files_libgalliumvlwinsys = files('vl/vl_winsys.h')
-if with_dri2
- files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c')
- if with_dri3
- files_libgalliumvlwinsys += files('vl/vl_winsys_dri3.c')
- endif
-endif
-if with_platform_drm
- files_libgalliumvlwinsys += files('vl/vl_winsys_drm.c')
-endif
-
-u_indices_gen_c = custom_target(
- 'u_indices_gen.c',
- input : 'indices/u_indices_gen.py',
- output : 'u_indices_gen.c',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-u_unfilled_gen_c = custom_target(
- 'u_unfilled_gen.c',
- input : 'indices/u_unfilled_gen.py',
- output : 'u_unfilled_gen.c',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-u_format_table_c = custom_target(
- 'u_format_table.c',
- input : ['util/u_format_table.py', 'util/u_format.csv'],
- output : 'u_format_table.c',
- command : [prog_python2, '@INPUT@'],
- depend_files : files('util/u_format_pack.py', 'util/u_format_parse.py'),
- capture : true,
-)
-
-libgallium = static_library(
- 'gallium',
- [files_libgallium, u_indices_gen_c, u_unfilled_gen_c, u_format_table_c,
- nir_opcodes_h],
- include_directories : [
- inc_loader, inc_gallium, inc_src, inc_include, include_directories('util')
- ],
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- dependencies : [dep_libdrm, dep_llvm, dep_unwind, dep_dl],
- build_by_default : false,
-)
-
-libgalliumvl_stub = static_library(
- 'galliumvl_stub',
- 'vl/vl_stubs.c',
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories: [inc_gallium, inc_include, inc_src],
- build_by_default : false,
-)
-
-libgalliumvl = static_library(
- 'galliumvl',
- files_libgalliumvl,
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_gallium, inc_include, inc_src],
- build_by_default : false,
-)
-
-# XXX: The dependencies here may be off...
-libgalliumvlwinsys = static_library(
- 'galliumvlwinsys',
- files_libgalliumvlwinsys,
- include_directories : [inc_gallium, inc_include, inc_loader, inc_src],
- dependencies : [dep_libdrm],
- build_by_default : false,
-)
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
deleted file mode 100644
index 9b12432aea0..00000000000
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-files_pipe_loader = files(
- 'pipe_loader.c',
- 'pipe_loader.h',
- 'pipe_loader_priv.h',
- 'pipe_loader_sw.c',
- 'driinfo_gallium.h',
-)
-
-libpipe_loader_defines = []
-
-if dep_libdrm.found()
- files_pipe_loader += files('pipe_loader_drm.c')
-endif
-if with_gallium_drisw_kms
- libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
-endif
-
-libpipe_loader_static = static_library(
- 'pipe_loader_static',
- files_pipe_loader,
- include_directories : [
- inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
- inc_gallium_winsys,
- ],
- c_args : [
- c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1',
- libpipe_loader_defines,
- ],
- link_with : [libloader, libxmlconfig],
- dependencies : [dep_libdrm],
- build_by_default : false,
-)
-
-libpipe_loader_dynamic = static_library(
- 'pipe_loader_dynamic',
- files_pipe_loader,
- include_directories : [
- inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
- inc_gallium_winsys,
- ],
- c_args : [
- c_vis_args, libpipe_loader_defines, '-DHAVE_PIPE_LOADER_DRI',
- '-DPIPE_SEARCH_DIR="@0@"'.format(join_paths(get_option('libdir'), 'gallium-pipe')
- )
- ],
- link_with : [libloader, libxmlconfig],
- dependencies : [dep_libdrm],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/ddebug/meson.build b/src/gallium/drivers/ddebug/meson.build
deleted file mode 100644
index 09ede3d04d4..00000000000
--- a/src/gallium/drivers/ddebug/meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libddebug = static_library(
- 'ddebug',
- files('dd_context.c', 'dd_draw.c', 'dd_pipe.h', 'dd_public.h', 'dd_screen.c',
- 'dd_util.h'),
- c_args : [c_vis_args],
- include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
deleted file mode 100644
index ca1d2aa797b..00000000000
--- a/src/gallium/drivers/llvmpipe/meson.build
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright © 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 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.
-
-files_llvmpipe = files(
- 'lp_bld_alpha.c',
- 'lp_bld_alpha.h',
- 'lp_bld_blend_aos.c',
- 'lp_bld_blend.c',
- 'lp_bld_blend.h',
- 'lp_bld_blend_logicop.c',
- 'lp_bld_depth.c',
- 'lp_bld_depth.h',
- 'lp_bld_interp.c',
- 'lp_bld_interp.h',
- 'lp_clear.c',
- 'lp_clear.h',
- 'lp_context.c',
- 'lp_context.h',
- 'lp_debug.h',
- 'lp_draw_arrays.c',
- 'lp_fence.c',
- 'lp_fence.h',
- 'lp_flush.c',
- 'lp_flush.h',
- 'lp_jit.c',
- 'lp_jit.h',
- 'lp_limits.h',
- 'lp_memory.c',
- 'lp_memory.h',
- 'lp_perf.c',
- 'lp_perf.h',
- 'lp_public.h',
- 'lp_query.c',
- 'lp_query.h',
- 'lp_rast.c',
- 'lp_rast_debug.c',
- 'lp_rast.h',
- 'lp_rast_priv.h',
- 'lp_rast_tri.c',
- 'lp_rast_tri_tmp.h',
- 'lp_scene.c',
- 'lp_scene.h',
- 'lp_scene_queue.c',
- 'lp_scene_queue.h',
- 'lp_screen.c',
- 'lp_screen.h',
- 'lp_setup.c',
- 'lp_setup_context.h',
- 'lp_setup.h',
- 'lp_setup_line.c',
- 'lp_setup_point.c',
- 'lp_setup_tri.c',
- 'lp_setup_vbuf.c',
- 'lp_state_blend.c',
- 'lp_state_clip.c',
- 'lp_state_derived.c',
- 'lp_state_fs.c',
- 'lp_state_fs.h',
- 'lp_state_gs.c',
- 'lp_state.h',
- 'lp_state_rasterizer.c',
- 'lp_state_sampler.c',
- 'lp_state_setup.c',
- 'lp_state_setup.h',
- 'lp_state_so.c',
- 'lp_state_surface.c',
- 'lp_state_vertex.c',
- 'lp_state_vs.c',
- 'lp_surface.c',
- 'lp_surface.h',
- 'lp_tex_sample.c',
- 'lp_tex_sample.h',
- 'lp_texture.c',
- 'lp_texture.h',
-)
-
-libllvmpipe = static_library(
- 'llvmpipe',
- files_llvmpipe,
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
- dependencies : dep_llvm,
- build_by_default : false,
-)
-
-if with_tests and with_gallium_softpipe and with_llvm
- foreach t : ['lp_test_format', 'lp_test_arit', 'lp_test_blend',
- 'lp_test_conv', 'lp_test_printf']
- test(t, executable(
- t,
- ['@0 at .c'.format(t), 'lp_test_main.c'],
- dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock],
- include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
- link_with : [libllvmpipe, libgallium, libmesa_util],
- )
- )
- endforeach
-endif
diff --git a/src/gallium/drivers/noop/meson.build b/src/gallium/drivers/noop/meson.build
deleted file mode 100644
index c4bb1508e3c..00000000000
--- a/src/gallium/drivers/noop/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libnoop = static_library(
- 'noop',
- files('noop_pipe.c', 'noop_public.h', 'noop_state.c'),
- c_args : [c_vis_args],
- include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
deleted file mode 100644
index 2bc6142879e..00000000000
--- a/src/gallium/drivers/nouveau/meson.build
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-files_libnouveau = files(
- 'nouveau_buffer.c',
- 'nouveau_buffer.h',
- 'nouveau_context.h',
- 'nouveau_debug.h',
- 'nouveau_fence.c',
- 'nouveau_fence.h',
- 'nouveau_gldefs.h',
- 'nouveau_heap.c',
- 'nouveau_heap.h',
- 'nouveau_mm.c',
- 'nouveau_mm.h',
- 'nouveau_screen.c',
- 'nouveau_screen.h',
- 'nouveau_statebuf.h',
- 'nouveau_video.c',
- 'nouveau_video.h',
- 'nouveau_vp3_video_bsp.c',
- 'nouveau_vp3_video.c',
- 'nouveau_vp3_video.h',
- 'nouveau_vp3_video_vp.c',
- 'nouveau_winsys.h',
- 'nv17_mpeg.xml.h',
- 'nv31_mpeg.xml.h',
- 'nv_m2mf.xml.h',
- 'nv_object.xml.h',
- 'nv30/nv01_2d.xml.h',
- 'nv30/nv30-40_3d.xml.h',
- 'nv30/nv30_clear.c',
- 'nv30/nv30_context.c',
- 'nv30/nv30_context.h',
- 'nv30/nv30_draw.c',
- 'nv30/nv30_format.c',
- 'nv30/nv30_format.h',
- 'nv30/nv30_fragprog.c',
- 'nv30/nv30_fragtex.c',
- 'nv30/nv30_miptree.c',
- 'nv30/nv30_push.c',
- 'nv30/nv30_query.c',
- 'nv30/nv30_resource.c',
- 'nv30/nv30_resource.h',
- 'nv30/nv30_screen.c',
- 'nv30/nv30_screen.h',
- 'nv30/nv30_state.c',
- 'nv30/nv30_state.h',
- 'nv30/nv30_state_validate.c',
- 'nv30/nv30_texture.c',
- 'nv30/nv30_transfer.c',
- 'nv30/nv30_transfer.h',
- 'nv30/nv30_vbo.c',
- 'nv30/nv30_vertprog.c',
- 'nv30/nv30_vertprog.h',
- 'nv30/nv30_winsys.h',
- 'nv30/nv40_vertprog.h',
- 'nv30/nv40_verttex.c',
- 'nv30/nvfx_fragprog.c',
- 'nv30/nvfx_shader.h',
- 'nv30/nvfx_vertprog.c',
- 'nv50/g80_defs.xml.h',
- 'nv50/g80_texture.xml.h',
- 'nv50/nv50_2d.xml.h',
- 'nv50/nv50_3ddefs.xml.h',
- 'nv50/nv50_3d.xml.h',
- 'nv50/nv50_blit.h',
- 'nv50/nv50_compute.c',
- 'nv50/nv50_compute.xml.h',
- 'nv50/nv50_context.c',
- 'nv50/nv50_context.h',
- 'nv50/nv50_formats.c',
- 'nv50/nv50_miptree.c',
- 'nv50/nv50_program.c',
- 'nv50/nv50_program.h',
- 'nv50/nv50_push.c',
- 'nv50/nv50_query.c',
- 'nv50/nv50_query.h',
- 'nv50/nv50_query_hw.c',
- 'nv50/nv50_query_hw.h',
- 'nv50/nv50_query_hw_metric.c',
- 'nv50/nv50_query_hw_metric.h',
- 'nv50/nv50_query_hw_sm.c',
- 'nv50/nv50_query_hw_sm.h',
- 'nv50/nv50_resource.c',
- 'nv50/nv50_resource.h',
- 'nv50/nv50_screen.c',
- 'nv50/nv50_screen.h',
- 'nv50/nv50_shader_state.c',
- 'nv50/nv50_state.c',
- 'nv50/nv50_stateobj.h',
- 'nv50/nv50_stateobj_tex.h',
- 'nv50/nv50_state_validate.c',
- 'nv50/nv50_surface.c',
- 'nv50/nv50_tex.c',
- 'nv50/nv50_transfer.c',
- 'nv50/nv50_transfer.h',
- 'nv50/nv50_vbo.c',
- 'nv50/nv50_winsys.h',
- 'nv50/nv84_video_bsp.c',
- 'nv50/nv84_video.c',
- 'nv50/nv84_video.h',
- 'nv50/nv84_video_vp.c',
- 'nv50/nv98_video_bsp.c',
- 'nv50/nv98_video.c',
- 'nv50/nv98_video.h',
- 'nv50/nv98_video_ppp.c',
- 'nv50/nv98_video_vp.c',
- 'codegen/nv50_ir.cpp',
- 'codegen/nv50_ir_bb.cpp',
- 'codegen/nv50_ir_build_util.cpp',
- 'codegen/nv50_ir_build_util.h',
- 'codegen/nv50_ir_driver.h',
- 'codegen/nv50_ir_emit_nv50.cpp',
- 'codegen/nv50_ir_from_tgsi.cpp',
- 'codegen/nv50_ir_graph.cpp',
- 'codegen/nv50_ir_graph.h',
- 'codegen/nv50_ir.h',
- 'codegen/nv50_ir_inlines.h',
- 'codegen/nv50_ir_lowering_nv50.cpp',
- 'codegen/nv50_ir_peephole.cpp',
- 'codegen/nv50_ir_print.cpp',
- 'codegen/nv50_ir_ra.cpp',
- 'codegen/nv50_ir_ssa.cpp',
- 'codegen/nv50_ir_target.cpp',
- 'codegen/nv50_ir_target.h',
- 'codegen/nv50_ir_target_nv50.cpp',
- 'codegen/nv50_ir_target_nv50.h',
- 'codegen/nv50_ir_util.cpp',
- 'codegen/nv50_ir_util.h',
- 'codegen/unordered_set.h',
- 'codegen/nv50_ir_emit_gk110.cpp',
- 'codegen/nv50_ir_emit_gm107.cpp',
- 'codegen/nv50_ir_emit_nvc0.cpp',
- 'codegen/nv50_ir_lowering_gm107.cpp',
- 'codegen/nv50_ir_lowering_gm107.h',
- 'codegen/nv50_ir_lowering_nvc0.cpp',
- 'codegen/nv50_ir_lowering_nvc0.h',
- 'codegen/nv50_ir_target_gm107.cpp',
- 'codegen/nv50_ir_target_gm107.h',
- 'codegen/nv50_ir_target_nvc0.cpp',
- 'codegen/nv50_ir_target_nvc0.h',
- 'nvc0/gm107_texture.xml.h',
- 'nvc0/nvc0_3d.xml.h',
- 'nvc0/nvc0_compute.c',
- 'nvc0/nvc0_compute.xml.h',
- 'nvc0/nvc0_context.c',
- 'nvc0/nvc0_context.h',
- 'nvc0/nvc0_formats.c',
- 'nvc0/nvc0_m2mf.xml.h',
- 'nvc0/nvc0_macros.h',
- 'nvc0/nvc0_miptree.c',
- 'nvc0/nvc0_program.c',
- 'nvc0/nvc0_program.h',
- 'nvc0/nvc0_query.c',
- 'nvc0/nvc0_query.h',
- 'nvc0/nvc0_query_hw.c',
- 'nvc0/nvc0_query_hw.h',
- 'nvc0/nvc0_query_hw_metric.c',
- 'nvc0/nvc0_query_hw_metric.h',
- 'nvc0/nvc0_query_hw_sm.c',
- 'nvc0/nvc0_query_hw_sm.h',
- 'nvc0/nvc0_query_sw.c',
- 'nvc0/nvc0_query_sw.h',
- 'nvc0/nvc0_resource.c',
- 'nvc0/nvc0_resource.h',
- 'nvc0/nvc0_screen.c',
- 'nvc0/nvc0_screen.h',
- 'nvc0/nvc0_shader_state.c',
- 'nvc0/nvc0_state.c',
- 'nvc0/nvc0_stateobj.h',
- 'nvc0/nvc0_state_validate.c',
- 'nvc0/nvc0_surface.c',
- 'nvc0/nvc0_tex.c',
- 'nvc0/nvc0_transfer.c',
- 'nvc0/nvc0_vbo.c',
- 'nvc0/nvc0_vbo_translate.c',
- 'nvc0/nvc0_video_bsp.c',
- 'nvc0/nvc0_video.c',
- 'nvc0/nvc0_video.h',
- 'nvc0/nvc0_video_ppp.c',
- 'nvc0/nvc0_video_vp.c',
- 'nvc0/nvc0_winsys.h',
- 'nvc0/nve4_compute.c',
- 'nvc0/nve4_compute.h',
- 'nvc0/nve4_compute.xml.h',
- 'nvc0/nve4_p2mf.xml.h',
-)
-
-libnouveau = static_library(
- 'nouveau',
- [files_libnouveau],
- include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
- c_args : [c_vis_args],
- cpp_args : [cpp_vis_args],
- dependencies : [dep_libdrm, dep_libdrm_nouveau],
- build_by_default : false,
-)
-
-nouveau_compiler = executable(
- 'nouveau_compiler',
- 'nouveau_compiler.c',
- include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
- dependencies : [dep_libdrm, dep_libdrm_nouveau],
- link_with : [libnouveau, libgallium, libmesa_util],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/radeon/meson.build b/src/gallium/drivers/radeon/meson.build
deleted file mode 100644
index b4d2832d016..00000000000
--- a/src/gallium/drivers/radeon/meson.build
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-files_libradeon = files(
- 'r600_buffer_common.c',
- 'r600_cs.h',
- 'r600_gpu_load.c',
- 'r600_perfcounter.c',
- 'r600_pipe_common.c',
- 'r600_pipe_common.h',
- 'r600_query.c',
- 'r600_query.h',
- 'r600_test_dma.c',
- 'r600_texture.c',
- 'radeon_uvd.c',
- 'radeon_uvd.h',
- 'radeon_vcn_dec.c',
- 'radeon_vcn_dec.h',
- 'radeon_vce_40_2_2.c',
- 'radeon_vce_50.c',
- 'radeon_vce_52.c',
- 'radeon_vce.c',
- 'radeon_vce.h',
- 'radeon_video.c',
- 'radeon_video.h',
- 'radeon_winsys.h',
-)
-
-libradeon = static_library(
- 'radeon',
- files_libradeon,
- c_args : ['-Wstrict-overflow=0', c_vis_args],
- dependencies : [dep_llvm, dep_clock],
- include_directories : [
- inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- ],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
deleted file mode 100644
index b0089c0d56e..00000000000
--- a/src/gallium/drivers/radeonsi/meson.build
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-files_libradeonsi = files(
- 'cik_sdma.c',
- 'driinfo_radeonsi.h',
- 'si_blit.c',
- 'si_compute.c',
- 'si_compute.h',
- 'si_cp_dma.c',
- 'si_debug.c',
- 'si_descriptors.c',
- 'si_dma.c',
- 'si_hw_context.c',
- 'si_pipe.c',
- 'si_pipe.h',
- 'si_pm4.c',
- 'si_pm4.h',
- 'si_perfcounter.c',
- 'si_public.h',
- 'si_shader.c',
- 'si_shader.h',
- 'si_shader_internal.h',
- 'si_shader_nir.c',
- 'si_shader_tgsi_alu.c',
- 'si_shader_tgsi_mem.c',
- 'si_shader_tgsi_setup.c',
- 'si_state.c',
- 'si_state_binning.c',
- 'si_state_draw.c',
- 'si_state_msaa.c',
- 'si_state_shaders.c',
- 'si_state_streamout.c',
- 'si_state_viewport.c',
- 'si_state.h',
- 'si_uvd.c',
-)
-
-si_driinfo_h = custom_target(
- 'si_driinfo.h',
- input : files(
- '../../../util/merge_driinfo.py',
- '../../auxiliary/pipe-loader/driinfo_gallium.h', 'driinfo_radeonsi.h'
- ),
- output : 'si_driinfo.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-libradeonsi = static_library(
- 'radeonsi',
- [files_libradeonsi, si_driinfo_h, nir_opcodes_h, sid_tables_h],
- include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
- inc_gallium_drivers,
- ],
- c_args : [c_vis_args],
- cpp_args : [cpp_vis_args],
- dependencies : dep_llvm,
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/rbug/meson.build b/src/gallium/drivers/rbug/meson.build
deleted file mode 100644
index 9c74171f7b5..00000000000
--- a/src/gallium/drivers/rbug/meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-librbug = static_library(
- 'rbug',
- files('rbug_context.c', 'rbug_context.h', 'rbug_core.c', 'rbug_objects.c',
- 'rbug_objects.h', 'rbug_public.h', 'rbug_screen.c', 'rbug_screen.h'),
- include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
- c_args : [c_vis_args],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/softpipe/meson.build b/src/gallium/drivers/softpipe/meson.build
deleted file mode 100644
index 0cef15152e2..00000000000
--- a/src/gallium/drivers/softpipe/meson.build
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright © 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 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.
-
-files_softpipe = files(
- 'sp_buffer.c',
- 'sp_buffer.h',
- 'sp_clear.c',
- 'sp_clear.h',
- 'sp_context.c',
- 'sp_context.h',
- 'sp_compute.c',
- 'sp_draw_arrays.c',
- 'sp_fence.c',
- 'sp_fence.h',
- 'sp_flush.c',
- 'sp_flush.h',
- 'sp_fs_exec.c',
- 'sp_fs.h',
- 'sp_image.c',
- 'sp_image.h',
- 'sp_limits.h',
- 'sp_prim_vbuf.c',
- 'sp_prim_vbuf.h',
- 'sp_public.h',
- 'sp_quad_blend.c',
- 'sp_quad_depth_test.c',
- 'sp_quad_depth_test_tmp.h',
- 'sp_quad_fs.c',
- 'sp_quad.h',
- 'sp_quad_pipe.c',
- 'sp_quad_pipe.h',
- 'sp_quad_stipple.c',
- 'sp_query.c',
- 'sp_query.h',
- 'sp_screen.c',
- 'sp_screen.h',
- 'sp_setup.c',
- 'sp_setup.h',
- 'sp_state_blend.c',
- 'sp_state_clip.c',
- 'sp_state_derived.c',
- 'sp_state_image.c',
- 'sp_state.h',
- 'sp_state_rasterizer.c',
- 'sp_state_sampler.c',
- 'sp_state_shader.c',
- 'sp_state_so.c',
- 'sp_state_surface.c',
- 'sp_state_vertex.c',
- 'sp_surface.c',
- 'sp_surface.h',
- 'sp_tex_sample.c',
- 'sp_tex_sample.h',
- 'sp_tex_tile_cache.c',
- 'sp_tex_tile_cache.h',
- 'sp_texture.c',
- 'sp_texture.h',
- 'sp_tile_cache.c',
- 'sp_tile_cache.h',
-)
-
-libsoftpipe = static_library(
- 'softpipe',
- files_softpipe,
- include_directories : [inc_gallium_aux, inc_gallium, inc_include, inc_src],
- c_args : [c_vis_args, c_msvc_compat_args],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/trace/meson.build b/src/gallium/drivers/trace/meson.build
deleted file mode 100644
index 4fc5d8ba0f6..00000000000
--- a/src/gallium/drivers/trace/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libtrace = static_library(
- 'trace',
- files('tr_context.c', 'tr_context.h', 'tr_dump.c', 'tr_dump_defines.h',
- 'tr_dump.h', 'tr_dump_state.c', 'tr_dump_state.h', 'tr_public.h',
- 'tr_screen.c', 'tr_screen.h', 'tr_texture.c', 'tr_texture.h'),
- c_args : [c_msvc_compat_args, c_vis_args],
- include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
deleted file mode 100644
index 38b47fbdd97..00000000000
--- a/src/gallium/drivers/vc4/meson.build
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright © 2017 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 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.
-
-files_libvc4 = files(
- 'kernel/vc4_drv.h',
- 'kernel/vc4_gem.c',
- 'kernel/vc4_packet.h',
- 'kernel/vc4_render_cl.c',
- 'kernel/vc4_validate.c',
- 'kernel/vc4_validate_shaders.c',
- 'vc4_blit.c',
- 'vc4_bufmgr.c',
- 'vc4_bufmgr.h',
- 'vc4_cl.c',
- 'vc4_cl_dump.c',
- 'vc4_cl_dump.h',
- 'vc4_cl.h',
- 'vc4_context.c',
- 'vc4_context.h',
- 'vc4_draw.c',
- 'vc4_emit.c',
- 'vc4_fence.c',
- 'vc4_formats.c',
- 'vc4_job.c',
- 'vc4_nir_lower_blend.c',
- 'vc4_nir_lower_io.c',
- 'vc4_nir_lower_txf_ms.c',
- 'vc4_opt_algebraic.c',
- 'vc4_opt_constant_folding.c',
- 'vc4_opt_copy_propagation.c',
- 'vc4_opt_dead_code.c',
- 'vc4_opt_peephole_sf.c',
- 'vc4_opt_small_immediates.c',
- 'vc4_opt_vpm.c',
- 'vc4_opt_coalesce_ff_writes.c',
- 'vc4_program.c',
- 'vc4_qir.c',
- 'vc4_qir_emit_uniform_stream_resets.c',
- 'vc4_qir_live_variables.c',
- 'vc4_qir_lower_uniforms.c',
- 'vc4_qir_schedule.c',
- 'vc4_qir_validate.c',
- 'vc4_qir.h',
- 'vc4_qpu.c',
- 'vc4_qpu_defines.h',
- 'vc4_qpu_disasm.c',
- 'vc4_qpu_emit.c',
- 'vc4_qpu.h',
- 'vc4_qpu_schedule.c',
- 'vc4_qpu_validate.c',
- 'vc4_query.c',
- 'vc4_register_allocate.c',
- 'vc4_reorder_uniforms.c',
- 'vc4_resource.c',
- 'vc4_resource.h',
- 'vc4_screen.c',
- 'vc4_screen.h',
- 'vc4_simulator.c',
- 'vc4_simulator_validate.h',
- 'vc4_state.c',
- 'vc4_tiling.c',
- 'vc4_tiling_lt.c',
- 'vc4_tiling.h',
- 'vc4_uniforms.c',
-)
-
-simpenrose_c_args = []
-dep_simpenrose = dependency('simpenrose', required : false)
-if dep_simpenrose.found()
- simpenrose_c_args = '-DUSE_VC4_SIMULATOR'
-endif
-
-libvc4 = static_library(
- 'vc4',
- [files_libvc4, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
- include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers, inc_drm_uapi,
- ],
- c_args : [c_vis_args, simpenrose_c_args],
- cpp_args : [cpp_vis_args],
- dependencies : [dep_simpenrose, dep_libdrm, dep_valgrind],
- build_by_default : false,
-)
diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/vc5/meson.build
deleted file mode 100644
index d066366fcc7..00000000000
--- a/src/gallium/drivers/vc5/meson.build
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright © 2017 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 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.
-
-files_libvc5 = files(
- 'vc5_blit.c',
- 'vc5_bufmgr.c',
- 'vc5_bufmgr.h',
- 'vc5_cl.c',
- 'vc5_cl.h',
- 'vc5_context.c',
- 'vc5_context.h',
- 'vc5_draw.c',
- 'vc5_emit.c',
- 'vc5_fence.c',
- 'vc5_formats.c',
- 'vc5_job.c',
- 'vc5_program.c',
- 'vc5_query.c',
- 'vc5_rcl.c',
- 'vc5_resource.c',
- 'vc5_resource.h',
- 'vc5_screen.c',
- 'vc5_screen.h',
- 'vc5_simulator.c',
- 'vc5_state.c',
- 'vc5_tiling.c',
- 'vc5_tiling.h',
- 'vc5_uniforms.c',
-)
-
-v3dv3_c_args = []
-dep_v3dv3 = dependency('v3dv3')
-if dep_v3dv3.found()
- v3dv3_c_args = '-DUSE_VC5_SIMULATOR'
-endif
-
-libvc5 = static_library(
- 'vc5',
- [files_libvc5, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
- include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers, inc_drm_uapi,
- ],
- c_args : [c_vis_args, v3dv3_c_args],
- cpp_args : [cpp_vis_args],
- dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind],
- build_by_default : false,
-)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
deleted file mode 100644
index 97347819d60..00000000000
--- a/src/gallium/meson.build
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-inc_gallium = include_directories('include')
-inc_gallium_drivers = include_directories('drivers')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
-subdir('drivers/ddebug')
-subdir('drivers/noop')
-subdir('drivers/trace')
-subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('drivers/nouveau')
-subdir('drivers/softpipe')
-if with_gallium_vc4
- subdir('drivers/vc4')
-endif
-if with_gallium_vc5
- subdir('drivers/vc5')
-endif
-subdir('drivers/llvmpipe')
-subdir('winsys/sw/null')
-subdir('winsys/sw/dri')
-subdir('winsys/sw/kms-dri')
-subdir('winsys/sw/wrapper')
-if with_gallium_vc4
- subdir('winsys/pl111/drm')
-endif
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('winsys/nouveau/drm')
-if with_gallium_vc4
- subdir('winsys/vc4/drm')
-endif
-if with_gallium_vc5
- subdir('winsys/vc5/drm')
-endif
-subdir('state_trackers/dri')
-# TODO: freedreno
-# TODO: i915
-# TODO: SVGA
-# TODO: r300
-# TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: SWR
-# TODO: virgl
-# TODO: winsys/sw/xlib
-# TODO: clover
-if with_dri and with_gallium
- subdir('targets/dri')
-endif
-# TODO: xlib-glx
-# TODO: OMX
-# TODO: osmesa
-# TODO: VA
-# TODO: vdpau
-# TODO: xa
-# TODO: xvmc
-# TODO: nine
-# TODO: tests
diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
deleted file mode 100644
index 5d89f23a6fe..00000000000
--- a/src/gallium/state_trackers/dri/meson.build
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-files_libdri = files(
- 'dri_context.c',
- 'dri_context.h',
- 'dri_drawable.c',
- 'dri_drawable.h',
- 'dri_helpers.c',
- 'dri_helpers.h',
- 'dri_query_renderer.c',
- 'dri_query_renderer.h',
- 'dri_screen.c',
- 'dri_screen.h',
-)
-
-if with_dri
- files_libdri += files('drisw.c')
-endif
-
-if with_dri2
- files_libdri += files('dri2.c', 'dri2_buffer.h')
-endif
-
-libdri_c_args = []
-if with_gallium_softpipe
- libdri_c_args += '-DGALLIUM_SOFTPIPE'
-endif
-
-libdri = static_library(
- 'dri',
- files_libdri,
- include_directories : [
- inc_include, inc_util, inc_mesa, inc_mapi, inc_src, inc_gallium,
- inc_gallium_aux, inc_dri_common,
- ],
- c_args : [c_vis_args, libdri_c_args],
- dependencies : dep_libdrm,
- build_by_default : false,
-)
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
deleted file mode 100644
index 541234f8032..00000000000
--- a/src/gallium/targets/dri/meson.build
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-# TODO: support non-static targets
-# Static targets are always enabled in autotools (unless you modify
-# configure.ac)
-
-gallium_dri_c_args = [
- '-DGALLIUM_DDEBUG',
- '-DGALLIUM_NOOP',
- '-DGALLIUM_RBUG',
- '-DGALLIUME_TRACE',
-]
-gallium_dri_ld_args = []
-gallium_dri_link_with = []
-gallium_dri_depends = []
-gallium_dri_link_depends = []
-gallium_dri_drivers = []
-gallium_dri_sources = []
-
-if with_ld_version_script
- gallium_dri_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'dri.sym')]
- gallium_dri_link_depends += files('dri.sym')
-endif
-if with_ld_dynamic_list
- gallium_dri_ld_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')]
- gallium_dri_link_depends += files('../dri-vdpau.dyn')
-endif
-
-if with_dri
- gallium_dri_link_with += libswdri
-endif
-if with_gallium_drisw_kms
- gallium_dri_link_with += libswkmsdri
-endif
-
-if with_gallium_pl111
- gallium_dri_c_args += '-DGALLIUM_PL111'
- gallium_dri_link_with += [libpl111winsys]
- gallium_dri_drivers += 'pl111_dri.so'
-endif
-if with_gallium_radeonsi
- gallium_dri_c_args += '-DGALLIUM_RADEONSI'
- gallium_dri_link_with += [
- libradeonsi, libradeonwinsys, libamdgpuwinsys, libradeon,
- libamd_common,
- ]
- gallium_dri_drivers += 'radeonsi_dri.so'
-endif
-if with_gallium_nouveau
- gallium_dri_c_args += '-DGALLIUM_NOUVEAU'
- gallium_dri_link_with += [libnouveauwinsys, libnouveau]
- gallium_dri_drivers += 'nouveau_dri.so'
-endif
-if with_gallium_softpipe
- gallium_dri_c_args += '-DGALLIUM_SOFTPIPE'
- gallium_dri_link_with += libsoftpipe
- gallium_dri_drivers += 'swrast_dri.so'
- if with_gallium_drisw_kms
- gallium_dri_drivers += 'kms_swrast_dri.so'
- endif
- if with_llvm
- gallium_dri_c_args += '-DGALLIUM_LLVMPIPE'
- gallium_dri_link_with += libllvmpipe
- endif
-endif
-if with_gallium_vc4
- gallium_dri_c_args += '-DGALLIUM_VC4'
- gallium_dri_link_with += [libvc4, libvc4winsys]
- gallium_dri_drivers += 'vc4_dri.so'
-endif
-if with_gallium_vc5
- gallium_dri_c_args += '-DGALLIUM_VC5'
- gallium_dri_link_with += [libvc5, libvc5winsys, libbroadcom_vc5]
- gallium_dri_drivers += 'vc5_dri.so'
-endif
-
-if with_gallium_vc4 or with_gallium_vc5
- gallium_dri_link_with += libbroadcom_cle
-endif
-
-if with_gallium_vc4 or with_gallium_vc5 or with_gallium_radeonsi
- gallium_dri_link_with += libnir
-endif
-
-libgallium_dri = shared_library(
- 'gallium_dri',
- [files('target.c'), gallium_dri_sources],
- include_directories : [
- inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
- inc_gallium_winsys, include_directories('../../state_trackers/dri'),
- ],
- c_args : [c_vis_args, gallium_dri_c_args],
- cpp_args : [cpp_vis_args],
- link_args : [ld_args_gc_sections, gallium_dri_ld_args],
- link_depends : gallium_dri_link_depends,
- link_with : [
- libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl,
- libgallium, libddebug, libnoop, librbug, libtrace, libglapi,
- libpipe_loader_static, libws_null, libwsw, gallium_dri_link_with,
- ],
- dependencies : [
- gallium_dri_depends, dep_selinux, dep_expat, dep_libdrm, dep_llvm,
- ],
-)
-
-meson.add_install_script(
- join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
- libgallium_dri.full_path(),
- dri_drivers_path,
- gallium_dri_drivers,
-)
diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build
deleted file mode 100644
index a81750e842a..00000000000
--- a/src/gallium/winsys/amdgpu/drm/meson.build
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libamdgpuwinsys = static_library(
- 'amdgpuwinsys',
- files(
- 'amdgpu_bo.c', 'amdgpu_bo.h', 'amdgpu_cs.c', 'amdgpu_cs.h',
- 'amdgpu_public.h', 'amdgpu_surface.c', 'amdgpu_winsys.c',
- 'amdgpu_winsys.h',
- ),
- include_directories : [
- inc_amd, inc_gallium, inc_gallium_aux, inc_include, inc_src,
- ],
- c_args : [c_vis_args],
- cpp_args : [cpp_vis_args],
- link_with : libamdgpu_addrlib,
- dependencies : dep_libdrm_amdgpu,
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/nouveau/drm/meson.build b/src/gallium/winsys/nouveau/drm/meson.build
deleted file mode 100644
index b5ef0d7097f..00000000000
--- a/src/gallium/winsys/nouveau/drm/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libnouveauwinsys = static_library(
- 'nouveauwinsys',
- files('nouveau_drm_public.h', 'nouveau_drm_winsys.c'),
- include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- ],
- c_args : [c_vis_args],
- dependencies : [dep_libdrm_nouveau],
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/pl111/drm/meson.build b/src/gallium/winsys/pl111/drm/meson.build
deleted file mode 100644
index 952c0b46700..00000000000
--- a/src/gallium/winsys/pl111/drm/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 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 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.
-
-libpl111winsys = static_library(
- 'pl111winsys',
- files('pl111_drm_winsys.c'),
- include_directories : [
- inc_src, inc_include,
- inc_gallium, inc_gallium_aux, inc_gallium_winsys,
- ],
- c_args : [c_vis_args],
- dependencies: dep_libdrm,
-)
diff --git a/src/gallium/winsys/radeon/drm/meson.build b/src/gallium/winsys/radeon/drm/meson.build
deleted file mode 100644
index 8a3f8021157..00000000000
--- a/src/gallium/winsys/radeon/drm/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libradeonwinsys = static_library(
- 'radeonwinsys',
- files('radeon_drm_bo.c', 'radeon_drm_bo.h', 'radeon_drm_cs.c',
- 'radeon_drm_cs.h', 'radeon_drm_public.h', 'radeon_drm_surface.c',
- 'radeon_drm_winsys.c', 'radeon_drm_winsys.h'),
- include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
- c_args : [c_vis_args],
- dependencies : [dep_libdrm_radeon],
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/sw/dri/meson.build b/src/gallium/winsys/sw/dri/meson.build
deleted file mode 100644
index 6ada8d1bc7d..00000000000
--- a/src/gallium/winsys/sw/dri/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libswdri = static_library(
- 'swdri',
- files('dri_sw_winsys.c', 'dri_sw_winsys.h'),
- c_args : c_vis_args,
- include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/sw/kms-dri/meson.build b/src/gallium/winsys/sw/kms-dri/meson.build
deleted file mode 100644
index a26644d4f7d..00000000000
--- a/src/gallium/winsys/sw/kms-dri/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 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 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.
-
-
-libswkmsdri = static_library(
- 'swkmsdri',
- files('kms_dri_sw_winsys.c', 'kms_dri_sw_winsys.h'),
- c_args : c_vis_args,
- include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
- dependencies : dep_libdrm,
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/sw/null/meson.build b/src/gallium/winsys/sw/null/meson.build
deleted file mode 100644
index 08b0ff7e828..00000000000
--- a/src/gallium/winsys/sw/null/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libws_null = static_library(
- 'ws_null',
- files('null_sw_winsys.c', 'null_sw_winsys.h'),
- c_args : c_vis_args,
- include_directories : [inc_gallium, inc_src, inc_gallium_aux, inc_include],
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/sw/wrapper/meson.build b/src/gallium/winsys/sw/wrapper/meson.build
deleted file mode 100644
index 4672261f216..00000000000
--- a/src/gallium/winsys/sw/wrapper/meson.build
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright © 2017 Dylan Baker
-
-# 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 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.
-
-libwsw = static_library(
- 'wsw',
- files('wrapper_sw_winsys.c', 'wrapper_sw_winsys.h'),
- c_args : c_vis_args,
- include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
- build_by_default : false,
-)
diff --git a/src/gallium/winsys/vc4/drm/meson.build b/src/gallium/winsys/vc4/drm/meson.build
deleted file mode 100644
index 58216dc5f54..00000000000
--- a/src/gallium/winsys/vc4/drm/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 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 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.
-
-libvc4winsys = static_library(
- 'vc4winsys',
- files('vc4_drm_winsys.c'),
- include_directories : [
- inc_src, inc_include,
- inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- ],
- c_args : [c_vis_args],
-)
diff --git a/src/gallium/winsys/vc5/drm/meson.build b/src/gallium/winsys/vc5/drm/meson.build
deleted file mode 100644
index d85930134b0..00000000000
--- a/src/gallium/winsys/vc5/drm/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 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 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.
-
-libvc5winsys = static_library(
- 'vc5winsys',
- files('vc5_drm_winsys.c'),
- include_directories : [
- inc_src, inc_include,
- inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- ],
- c_args : [c_vis_args],
-)
diff --git a/src/gbm/meson.build b/src/gbm/meson.build
deleted file mode 100644
index 1bb3c94c387..00000000000
--- a/src/gbm/meson.build
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright © 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 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.
-
-inc_gbm = include_directories('.', 'backends/dri')
-
-files_gbm = files(
- 'main/backend.c',
- 'main/backend.h',
- 'main/gbm.c',
- 'main/gbm.h',
- 'main/gbmint.h',
-)
-deps_gbm = []
-args_gbm = []
-links_gbm = []
-deps_gbm = []
-
-if with_dri2
- files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
- deps_gbm += [dep_libdrm, dep_thread]
- args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir)
-endif
-if with_platform_wayland
- deps_gbm += dep_wayland_server
- links_gbm += libwayland_drm
-endif
-
-# TODO: wayland support (requires egl)
-
-libgbm = shared_library(
- 'gbm',
- files_gbm,
- include_directories : [
- include_directories('main'), inc_include, inc_src, inc_loader,
- include_directories('../egl/wayland/wayland-drm')],
- c_args : args_gbm,
- link_args : [ld_args_gc_sections],
- link_with : [links_gbm, libloader, libmesa_util, libxmlconfig],
- dependencies : [deps_gbm, dep_dl],
- version : '1.0',
- install : true,
-)
-
-install_headers('main/gbm.h')
-
-pkg.generate(
- name : 'gbm',
- filebase : 'gbm',
- description : 'Mesa gbm library',
- version : meson.project_version(),
- libraries : libgbm,
- libraries_private : '-ldl', # FIXME: autotools lists this a incomplete
-)
-
-if with_tests
- gbm_symbols_check = find_program('gbm-symbols-check')
- test('gbm-symbols-check', gbm_symbols_check)
-endif
diff --git a/src/glx/meson.build b/src/glx/meson.build
deleted file mode 100644
index 3fe5fcf0cd6..00000000000
--- a/src/glx/meson.build
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright © 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 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.
-
-# TODO:
-#subdir('windows')
-
-files_libglx = files(
- '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_glx.c',
- 'indirect_init.h',
- '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',
-)
-
-extra_libs_libglx = []
-
-if with_dri
- files_libglx += files(
- 'dri_common.c',
- 'dri_common.h',
- 'dri_common_query_renderer.c',
- 'dri_common_interop.c',
- 'xfont.c',
- 'drisw_glx.c',
- 'drisw_priv.h',
- )
-endif
-
-# dri2
-if with_dri and with_dri_platform == 'drm' and dep_libdrm.found()
- files_libglx += files(
- 'dri2.c',
- 'dri2_glx.c',
- 'dri2.h',
- 'dri2_priv.h',
- 'dri_glx.c',
- 'dri_sarea.h',
- 'XF86dri.c',
- 'xf86dri.h',
- 'xf86dristr.h',
- )
-endif
-
-if with_dri3
- files_libglx += files('dri3_glx.c', 'dri3_priv.h')
-endif
-
-if with_appledri
- files_libglx += files('applegl_glx.c')
-elif with_windowsdri
- files_libglx += files('driwindows_glx.c')
- # TODO
- #extra_libs_libglx += [
- #libwindowsdri,
- #libwindowsglx,
- #]
-endif
-
-dri_driver_dir = join_paths(get_option('prefix'), dri_drivers_path)
-if not with_glvnd
- gl_lib_name = 'GL'
- gl_lib_version = '1.2.0'
-else
- gl_lib_name = 'GLX_mesa'
- gl_lib_version = '0'
- files_libglx += files(
- 'g_glxglvnddispatchfuncs.c',
- 'g_glxglvnddispatchindices.h',
- 'glxglvnd.c',
- 'glxglvnd.h',
- 'glxglvnddispatchfuncs.h',
- )
-endif
-
-gl_lib_cargs = [
- '-D_REENTRANT', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir),
-]
-
-if dep_xf86vm != [] and dep_xf86vm.found()
- gl_lib_cargs += '-DHAVE_XF86VIDMODE'
-endif
-
-libglx = static_library(
- 'glx',
- [files_libglx, glx_generated],
- include_directories : [
- inc_common, inc_glapi, inc_loader,
- include_directories('../../include/GL/internal'),
- ],
- c_args : [c_vis_args, gl_lib_cargs,
- '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0])],
- link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig],
- dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
- build_by_default : false,
-)
-
-# workaround for bug #2180
-dummy_c = custom_target(
- 'dummy_c',
- output : 'dummy.c',
- command : [prog_touch, '@OUTPUT@'],
-)
-
-if with_glx == 'dri'
- libgl = shared_library(
- gl_lib_name,
- dummy_c, # workaround for bug #2180
- include_directories : [
- inc_common, inc_glapi, inc_loader,
- include_directories('../../include/GL/internal'),
- ],
- link_with : [libglapi_static, libglapi],
- link_whole : libglx,
- link_args : [ld_args_bsymbolic, ld_args_gc_sections],
- dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11,
- dep_xcb_dri2, dep_xcb_dri3],
- version : gl_lib_version,
- install : true,
- )
-
- pkg.generate(
- name : 'gl',
- filebase : 'gl',
- description : 'Mesa OpenGL Library',
- version : meson.project_version(),
- libraries : libgl,
- libraries_private : gl_priv_libs,
- requires_private : gl_priv_reqs,
- variables : ['glx_tls=yes'],
- )
-endif
-
-if with_tests
- subdir('tests')
-endif
diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
deleted file mode 100644
index d81b76906da..00000000000
--- a/src/glx/tests/meson.build
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright © 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 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 with_shared_glapi
- files_glx_test = files(
- '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 with_dri2
- files_glx_test += files('query_renderer_implementation_unittest.cpp')
- endif
-
- glx_test = executable(
- 'glx-test',
- [files_glx_test, glx_indirect_size_h],
- link_with : [libglx, libglapi],
- include_directories : [
- include_directories('..', '../../../include/GL/internal'),
- inc_src, inc_include, inc_mesa, inc_mapi,
- ],
- dependencies : [dep_libdrm, dep_thread, idep_gtest]
- )
-
- test('glx-test', glx_test)
- test('glx-dispatch-index-check', find_program('dispatch-index-check'))
-endif
diff --git a/src/gtest/meson.build b/src/gtest/meson.build
deleted file mode 100644
index 91a49240416..00000000000
--- a/src/gtest/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 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 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.
-
-libgtest = static_library(
- 'gtest',
- files('src/gtest-all.cc', 'src/gtest_main.cc'),
- include_directories : include_directories('include'),
- build_by_default : false,
-)
-
-idep_gtest = declare_dependency(
- link_with : libgtest,
- include_directories : include_directories('include', is_system : true),
-)
diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
deleted file mode 100644
index 9241535fd20..00000000000
--- a/src/intel/blorp/meson.build
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright © 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 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.
-
-files_libblorp = files(
- 'blorp.c',
- 'blorp.h',
- 'blorp_blit.c',
- 'blorp_clear.c',
- 'blorp_nir_builder.h',
- 'blorp_genX_exec.h',
- 'blorp_priv.h',
-)
-
-libblorp = static_library(
- 'blorp',
- [files_libblorp, nir_opcodes_h],
- include_directories : [inc_common, inc_intel],
- c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
-)
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
deleted file mode 100644
index db7d74a26d2..00000000000
--- a/src/intel/common/meson.build
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright © 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 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.
-
-# TODO: android?
-
-files_libintel_common = files(
- 'gen_clflush.h',
- 'gen_debug.c',
- 'gen_debug.h',
- 'gen_decoder.c',
- 'gen_decoder.h',
- 'gen_device_info.c',
- 'gen_device_info.h',
- 'gen_l3_config.c',
- 'gen_l3_config.h',
- 'gen_urb_config.c',
- 'gen_sample_positions.h',
- 'intel_log.c',
-)
-
-libintel_common = static_library(
- ['intel_common', genX_xml_h],
- files_libintel_common,
- include_directories : [inc_common, inc_intel],
- c_args : [c_vis_args, no_override_init_args],
- dependencies : [dep_expat, dep_libdrm],
- build_by_default : false,
-)
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
deleted file mode 100644
index e29e1d39e2a..00000000000
--- a/src/intel/compiler/meson.build
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright © 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 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.
-
-libintel_compiler_files = files(
- 'brw_cfg.cpp',
- 'brw_cfg.h',
- 'brw_clip.h',
- 'brw_clip_line.c',
- 'brw_clip_point.c',
- 'brw_clip_tri.c',
- 'brw_clip_unfilled.c',
- 'brw_clip_util.c',
- 'brw_compile_clip.c',
- 'brw_compile_sf.c',
- 'brw_compiler.c',
- 'brw_compiler.h',
- 'brw_dead_control_flow.cpp',
- 'brw_dead_control_flow.h',
- 'brw_disasm.c',
- 'brw_eu.c',
- 'brw_eu_compact.c',
- 'brw_eu_defines.h',
- 'brw_eu_emit.c',
- 'brw_eu.h',
- 'brw_eu_util.c',
- 'brw_eu_validate.c',
- 'brw_fs_builder.h',
- 'brw_fs_cmod_propagation.cpp',
- 'brw_fs_combine_constants.cpp',
- 'brw_fs_copy_propagation.cpp',
- 'brw_fs.cpp',
- 'brw_fs_cse.cpp',
- 'brw_fs_dead_code_eliminate.cpp',
- 'brw_fs_generator.cpp',
- 'brw_fs.h',
- 'brw_fs_live_variables.cpp',
- 'brw_fs_live_variables.h',
- 'brw_fs_lower_conversions.cpp',
- 'brw_fs_lower_pack.cpp',
- 'brw_fs_nir.cpp',
- 'brw_fs_reg_allocate.cpp',
- 'brw_fs_register_coalesce.cpp',
- 'brw_fs_saturate_propagation.cpp',
- 'brw_fs_sel_peephole.cpp',
- 'brw_fs_surface_builder.cpp',
- 'brw_fs_surface_builder.h',
- 'brw_fs_validate.cpp',
- 'brw_fs_visitor.cpp',
- 'brw_inst.h',
- 'brw_interpolation_map.c',
- 'brw_ir_allocator.h',
- 'brw_ir_fs.h',
- 'brw_ir_vec4.h',
- 'brw_nir.h',
- 'brw_nir.c',
- 'brw_nir_analyze_boolean_resolves.c',
- 'brw_nir_analyze_ubo_ranges.c',
- 'brw_nir_attribute_workarounds.c',
- 'brw_nir_lower_cs_intrinsics.c',
- 'brw_nir_opt_peephole_ffma.c',
- 'brw_nir_tcs_workarounds.c',
- 'brw_packed_float.c',
- 'brw_predicated_break.cpp',
- 'brw_reg.h',
- 'brw_reg_type.c',
- 'brw_reg_type.h',
- 'brw_schedule_instructions.cpp',
- 'brw_shader.cpp',
- 'brw_shader.h',
- 'brw_vec4_builder.h',
- 'brw_vec4_cmod_propagation.cpp',
- 'brw_vec4_copy_propagation.cpp',
- 'brw_vec4.cpp',
- 'brw_vec4_cse.cpp',
- 'brw_vec4_dead_code_eliminate.cpp',
- 'brw_vec4_generator.cpp',
- 'brw_vec4_gs_visitor.cpp',
- 'brw_vec4_gs_visitor.h',
- 'brw_vec4.h',
- 'brw_vec4_live_variables.cpp',
- 'brw_vec4_live_variables.h',
- 'brw_vec4_nir.cpp',
- 'brw_vec4_gs_nir.cpp',
- 'brw_vec4_reg_allocate.cpp',
- 'brw_vec4_surface_builder.cpp',
- 'brw_vec4_surface_builder.h',
- 'brw_vec4_tcs.cpp',
- 'brw_vec4_tcs.h',
- 'brw_vec4_tes.cpp',
- 'brw_vec4_tes.h',
- 'brw_vec4_visitor.cpp',
- 'brw_vec4_vs_visitor.cpp',
- 'brw_vec4_vs.h',
- 'brw_vue_map.c',
- 'brw_wm_iz.cpp',
- 'gen6_gs_visitor.cpp',
- 'gen6_gs_visitor.h',
- 'intel_asm_annotation.c',
- 'intel_asm_annotation.h',
-)
-
-brw_nir_trig = custom_target(
- 'brw_nir_trig_workarounds.c',
- input : 'brw_nir_trig_workarounds.py',
- output : 'brw_nir_trig_workarounds.c',
- command : [prog_python2, '@INPUT@', '-p',
- join_paths(meson.source_root(), 'src/compiler/nir/')],
- depend_files : files('../../compiler/nir/nir_algebraic.py'),
- capture : true,
-)
-
-libintel_compiler = static_library(
- 'intel_compiler',
- [libintel_compiler_files, brw_nir_trig, nir_opcodes_h, nir_builder_opcodes_h,
- ir_expression_operation_h],
- include_directories : [inc_common, inc_intel, inc_nir],
- c_args : [c_vis_args, no_override_init_args],
- cpp_args : [cpp_vis_args],
- build_by_default : false,
-)
-
-if with_tests
- # The last two tests are not C++ or gtest, pre comment in autotools make
- foreach t : ['fs_cmod_propagation', 'fs_copy_propagation',
- 'fs_saturate_propagation', 'vf_float_conversions',
- 'vec4_register_coalesce', 'vec4_copy_propagation',
- 'vec4_cmod_propagation', 'eu_compact', 'eu_validate']
- _exe = executable(
- [t, nir_opcodes_h, ir_expression_operation_h],
- 'test_ at 0@.cpp'.format(t),
- include_directories : [inc_common, inc_intel],
- link_with : [libintel_compiler, libintel_common, libnir, libmesa_util,
- libisl],
- dependencies : [dep_thread, dep_dl, idep_gtest],
- )
- test(t, _exe)
- endforeach
-endif
diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build
deleted file mode 100644
index 30c0d8bf2f6..00000000000
--- a/src/intel/genxml/meson.build
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 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 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.
-
-gen_xml_files = [
- 'gen4.xml',
- 'gen45.xml',
- 'gen5.xml',
- 'gen6.xml',
- 'gen7.xml',
- 'gen75.xml',
- 'gen8.xml',
- 'gen9.xml',
- 'gen10.xml',
-]
-
-genX_xml_h = custom_target(
- 'genX_xml.h',
- input : ['gen_zipped_file.py', gen_xml_files],
- output : 'genX_xml.h',
- command : [prog_python2, '@INPUT@'],
- capture : true,
-)
-
-genX_bits_h = custom_target(
- 'genX_bits.h',
- input : ['gen_bits_header.py', gen_xml_files],
- output : 'genX_bits.h',
- command : [prog_python2, '@INPUT@', '-o', '@OUTPUT@'],
-)
-
-gen_xml_pack = []
-foreach f : gen_xml_files
- _name = '@0 at _pack.h'.format(f.split('.')[0])
- _xml = custom_target(
- _name,
- input : ['gen_pack_header.py', f],
- output : _name,
- command : [prog_python2, '@INPUT@'],
- capture : true,
- )
- gen_xml_pack += _xml
-endforeach
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
deleted file mode 100644
index 54024b4d11b..00000000000
--- a/src/intel/isl/meson.build
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright © 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 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_files = files(
- 'isl_emit_depth_stencil.c',
- 'isl_surface_state.c',
-)
-
-isl_gen4_files = files(
- 'isl_gen4.c',
- 'isl_gen4.h',
-)
-
-isl_gen6_files = files(
- 'isl_gen6.c',
- 'isl_gen6.h',
-)
-
-isl_gen7_files = files(
- 'isl_gen7.c',
- 'isl_gen7.h',
-)
-
-isl_gen8_files = files(
- 'isl_gen8.c',
- 'isl_gen8.h',
-)
-
-isl_gen9_files = files(
- 'isl_gen9.c',
- 'isl_gen9.h',
-)
-
-isl_gen_libs = []
-foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
- ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
- ['90', isl_gen9_files], ['100', []]]
- _gen = g[0]
- _sources = g[1]
- _lib = static_library(
- 'libisl_gen at 0@'.format(_gen),
- [_sources, isl_gen_files, gen_xml_pack],
- include_directories : [inc_common, inc_intel],
- c_args : [c_vis_args, no_override_init_args,
- '-DGEN_VERSIONx10=@0@'.format(_gen)],
- build_by_default : false,
- )
- isl_gen_libs += _lib
-endforeach
-
-isl_format_layout_c = custom_target(
- 'isl_format_layout.c',
- input : ['gen_format_layout.py', 'isl_format_layout.csv'],
- output : 'isl_format_layout.c',
- command : [prog_python2, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
-)
-
-libisl_files = files(
- 'isl.c',
- 'isl.h',
- 'isl_drm.c',
- 'isl_genX_priv.h',
- 'isl_format.c',
- 'isl_priv.h',
- 'isl_storage_image.c',
-)
-
-libisl = static_library(
- 'isl',
- [libisl_files, isl_format_layout_c, genX_bits_h],
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
- link_with : isl_gen_libs,
- c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
-)
-
-if with_tests
- isl_surf_get_image_offset_test = executable(
- 'isl_surf_get_image_offset_test',
- 'tests/isl_surf_get_image_offset_test.c',
- dependencies : dep_m,
- include_directories : [inc_common, inc_intel],
- link_with : [libisl, libintel_common],
- build_by_default : false,
- )
-
- test('isl_surf_get_image_offset', isl_surf_get_image_offset_test)
-endif
diff --git a/src/intel/meson.build b/src/intel/meson.build
deleted file mode 100644
index 57676082c9d..00000000000
--- a/src/intel/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright © 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 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.
-
-inc_intel = include_directories('.')
-
-subdir('blorp')
-subdir('genxml')
-subdir('common')
-subdir('isl')
-subdir('compiler')
-subdir('tools')
-if with_intel_vk
- subdir('vulkan')
-endif
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
deleted file mode 100644
index 1996d5208f0..00000000000
--- a/src/intel/tools/meson.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 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 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.
-
-aubinator = executable(
- 'aubinator',
- files('aubinator.c', 'disasm.c', 'gen_disasm.h', 'intel_aub.h'),
- dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
- include_directories : [inc_common, inc_intel],
- link_with : [libintel_common, libintel_compiler, libmesa_util],
- c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
-)
-
-aubinator_error_decode = executable(
- 'aubinator_error_decode',
- files('aubinator_error_decode.c', 'disasm.c', 'gen_disasm.h'),
- dependencies : [dep_zlib, dep_thread],
- include_directories : [inc_common, inc_intel],
- link_with : [libintel_common, libintel_compiler, libmesa_util],
- c_args : [c_vis_args, no_override_init_args],
- build_by_default : false,
-)
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
deleted file mode 100644
index ff24e304ef5..00000000000
--- a/src/intel/vulkan/meson.build
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright © 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 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.
-
-anv_entrypoints = custom_target(
- 'anv_entrypoints.[ch]',
- input : ['anv_entrypoints_gen.py', vk_api_xml, vk_android_native_buffer_xml],
- output : ['anv_entrypoints.h', 'anv_entrypoints.c'],
- command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--xml', '@INPUT2@', '--outdir', meson.current_build_dir()],
- depend_files : files('anv_extensions.py'),
-)
-
-anv_extensions_c = custom_target(
- 'anv_extensions.c',
- input : ['anv_extensions.py', vk_api_xml, vk_android_native_buffer_xml],
- output : 'anv_extensions.c',
- command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--xml', '@INPUT2@', '--out', '@OUTPUT@'],
-)
-
-intel_icd = custom_target(
- 'intel_icd',
- input : 'anv_icd.py',
- output : 'intel_icd. at 0@.json'.format(target_machine.cpu()),
- command : [prog_python2, '@INPUT@',
- '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
- '--out', '@OUTPUT@'],
- depend_files : files('anv_extensions.py'),
- build_by_default : true,
- install_dir : with_vulkan_icd_dir,
- install : true,
-)
-
-# TODO: workaround for anv_entrypoints combining the .h and .c files in it's
-# output. See issue #2346
-block_entrypoints = custom_target(
- 'block_entrypoints',
- command : [prog_touch, '@OUTPUT@'],
- output : 'null',
- depends : anv_entrypoints,
-)
-
-libanv_gen_libs = []
-anv_gen_files = files(
- 'genX_blorp_exec.c',
- 'genX_cmd_buffer.c',
- 'genX_gpu_memcpy.c',
- 'genX_pipeline.c',
- 'genX_query.c',
- 'genX_state.c',
-)
-foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
- ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
- ['100', ['gen8_cmd_buffer.c']]]
- _gen = g[0]
- _files = g[1]
- _lib = static_library(
- 'libanv_gen at 0@'.format(_gen),
- [anv_gen_files, _files, block_entrypoints, nir_opcodes_h],
- include_directories : [inc_common, inc_compiler, inc_drm_uapi, inc_intel,
- inc_vulkan_util, inc_vulkan_wsi],
- c_args : [c_vis_args, no_override_init_args, '-msse2',
- '-DGEN_VERSIONx10=@0@'.format(_gen)],
- dependencies : [dep_libdrm, dep_valgrind],
- )
- libanv_gen_libs += _lib
-endforeach
-
-libanv_files = files(
- 'anv_allocator.c',
- 'anv_batch_chain.c',
- 'anv_blorp.c',
- 'anv_cmd_buffer.c',
- 'anv_debug_report.c',
- 'anv_descriptor_set.c',
- 'anv_device.c',
- 'anv_dump.c',
- 'anv_formats.c',
- 'anv_genX.h',
- 'anv_image.c',
- 'anv_intel.c',
- 'anv_nir.h',
- 'anv_nir_apply_pipeline_layout.c',
- 'anv_nir_lower_input_attachments.c',
- 'anv_nir_lower_multiview.c',
- 'anv_nir_lower_push_constants.c',
- 'anv_nir_lower_ycbcr_textures.c',
- 'anv_pass.c',
- 'anv_pipeline.c',
- 'anv_pipeline_cache.c',
- 'anv_private.h',
- 'anv_queue.c',
- 'anv_util.c',
- 'anv_wsi.c',
- 'vk_format_info.h',
-)
-
-anv_deps = []
-anv_flags = []
-
-if with_platform_x11
- anv_deps += dep_xcb_dri3
- anv_flags += [
- '-DVK_USE_PLATFORM_XCB_KHR',
- '-DVK_USE_PLATFORM_XLIB_KHR',
- ]
- libanv_files += files('anv_wsi_x11.c')
-endif
-
-if with_platform_wayland
- anv_deps += dep_wayland_client
- anv_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR'
- libanv_files += files('anv_wsi_wayland.c')
-endif
-
-libanv_common = static_library(
- 'anv_common',
- [libanv_files, anv_entrypoints, anv_extensions_c, nir_opcodes_h],
- include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
- inc_vulkan_util, inc_vulkan_wsi],
- c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
- dependencies : [dep_valgrind, anv_deps, dep_libdrm],
-)
-
-libvulkan_intel = shared_library(
- 'vulkan_intel',
- [files('anv_gem.c'), block_entrypoints],
- include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
- inc_vulkan_util, inc_vulkan_wsi],
- link_whole : [libanv_common, libanv_gen_libs],
- link_with : [libintel_compiler, libintel_common, libisl, libblorp,
- libvulkan_util, libvulkan_wsi, libnir, libmesa_util],
- dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind],
- c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
- link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
- install : true,
-)
-
-if with_tests
- libvulkan_intel_test = static_library(
- 'vulkan_intel_test',
- [files('anv_gem_stubs.c'), block_entrypoints],
- include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
- inc_vulkan_util, inc_vulkan_wsi],
- link_whole : libanv_common,
- link_with : [libanv_gen_libs, libintel_compiler, libintel_common,
- libisl, libblorp, libvulkan_util, libvulkan_wsi,
- libnir, libmesa_util],
- dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps,
- dep_valgrind],
- c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
- )
-
- foreach t : ['block_pool_no_free', 'state_pool_no_free',
- 'state_pool_free_list_only', 'state_pool']
- _exe = executable(
- t,
- ['tests/@0 at .c'.format(t), dummy_cpp, block_entrypoints],
- link_with : libvulkan_intel_test,
- dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
- include_directories : [inc_common, inc_intel, inc_compiler,
- inc_vulkan_util, inc_vulkan_wsi],
- )
- test('anv_ at 0@'.format(t), _exe)
- endforeach
-endif
diff --git a/src/loader/meson.build b/src/loader/meson.build
deleted file mode 100644
index 2f97cdc83bf..00000000000
--- a/src/loader/meson.build
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 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 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.
-
-inc_loader = include_directories('.')
-
-if with_platform_x11 and with_dri3
- libloader_dri3_helper = static_library(
- 'loader_dri3_helper',
- ['loader_dri3_helper.c', 'loader_dri3_helper.h'],
- c_args : c_vis_args,
- include_directories : inc_include,
- dependencies : [
- dep_xshmfence, dep_xcb_present, dep_xcb_dri3, dep_xcb_sync, dep_x11_xcb,
- dep_xext, dep_xdamage, dep_xcb_glx, dep_libdrm,
- ],
- build_by_default : false,
- )
-else
- libloader_dri3_helper = []
-endif
-
-libloader = static_library(
- 'loader',
- ['loader.c', 'loader.h', 'pci_id_driver_map.c', 'pci_id_driver_map.h',
- xmlpool_options_h],
- c_args : [c_vis_args, '-DUSE_DRICONF'],
- include_directories : [inc_include, inc_src, inc_util],
- dependencies : dep_libdrm,
- build_by_default : false,
-)
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
deleted file mode 100644
index 57cfb1e8d85..00000000000
--- a/src/mapi/es1api/meson.build
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 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 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.
-
-es1_glapi_mapi_tmp_h = custom_target(
- 'es1_glapi_mapi_tmp.h',
- input : ['../mapi_abi.py', gl_and_es_api_files],
- output : 'glapi_mapi_tmp.h',
- command : [prog_python2, '@INPUT0@', '--printer', 'es1api', '@INPUT1@'],
- depend_files : api_xml_files,
- capture : true,
-)
-
-libglesv1_cm = shared_library(
- 'GLESv1_CM',
- ['../entry.c', es1_glapi_mapi_tmp_h],
- c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
- '-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path())],
- link_args : [ld_args_gc_sections],
- include_directories : [inc_src, inc_include, inc_mapi],
- link_with : libglapi,
- dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
- version : '1.1',
- install : true,
-)
-
-pkg.generate(
- name : 'glesv1_cm',
- filebase : 'glesv1_cm',
- description : 'Mesa OpenGL ES 1.1 CM library',
- version : meson.project_version(),
- libraries : libglesv1_cm,
- libraries_private : '-lm -ldl -lpthread -pthread',
-)
-
-if with_tests
- test('es1-ABI-check', find_program('ABI-check'))
-endif
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
deleted file mode 100644
index f4922d755ad..00000000000
--- a/src/mapi/es2api/meson.build
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright © 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 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.
-
-es2_glapi_mapi_tmp_h = custom_target(
- 'es2_glapi_mapi_tmp.h',
- input : ['../mapi_abi.py', gl_and_es_api_files],
- output : 'glapi_mapi_tmp.h',
- command : [prog_python2, '@INPUT0@', '--printer', 'es2api', '@INPUT1@'],
- depend_files : api_xml_files,
- capture : true,
-)
-
-libgles2 = shared_library(
- 'GLESv2',
- ['../entry.c', es2_glapi_mapi_tmp_h],
- c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE',
- '-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path())],
- link_args : [ld_args_gc_sections],
- include_directories : [inc_src, inc_include, inc_mapi],
- link_with : libglapi,
- dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
- version : '2',
- install : true,
-)
-
-pkg.generate(
- name : 'glesv2',
- filebase : 'glesv2',
- description : 'Mesa OpenGL ES 2.0 library',
- version : meson.project_version(),
- libraries : libgles2,
- libraries_private : '-lm -ldl -lpthread -pthread',
-)
-
-if with_tests
- test('es2-ABI-check', find_program('ABI-check'))
-endif
diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
deleted file mode 100644
index 4360346edad..00000000000
--- a/src/mapi/glapi/gen/meson.build
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright © 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 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.
-
-gl_and_es_api_files = files('gl_and_es_API.xml')
-
-api_xml_files = files(
- '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_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_draw_buffers_blend.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_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_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',
- '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',
-)
-
-glapi_gen_depends = files(
- 'gl_XML.py',
- 'glX_XML.py',
- 'license.py',
- 'static_data.py',
- 'typeexpr.py',
-) + api_xml_files
-
-glx_gen_depends = files(
- 'glX_API.xml',
- 'glX_XML.py',
- 'glX_proto_common.py',
-) + api_xml_files
-
-glapi_mapi_tmp_h = custom_target(
- 'glapi_mapi_tmp.h',
- input : ['../../mapi_abi.py', 'gl_and_es_API.xml'],
- output : 'glapi_mapi_tmp.h',
- command : [prog_python2, '@INPUT0@', '--printer', 'glapi', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-gl_procs_h = custom_target(
- 'gl_procs.h',
- input : ['gl_procs.py', 'gl_and_es_API.xml'],
- output : 'gl_procs.h',
- command : [prog_python2, '@INPUT0@', '-c', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-glapitemp_h = custom_target(
- 'glapitemp.h',
- input : ['gl_apitemp.py', 'gl_and_es_API.xml'],
- output : 'glapitemp.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-glapitable_h = custom_target(
- 'glapitable.h',
- input : ['gl_table.py', 'gl_and_es_API.xml'],
- output : 'glapitable.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-glapi_gentable_c = custom_target(
- 'glapi_gentable.c',
- input : ['gl_gentable.py', 'gl_and_es_API.xml'],
- output : 'glapi_gentable.c',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-main_enums_c = custom_target(
- 'enums.c',
- input : ['gl_enums.py', files('../registry/gl.xml')],
- output : 'enums.c',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- capture : true,
-)
-
-main_api_exec_c = custom_target(
- 'api_exec.c',
- input : ['gl_genexec.py', 'gl_and_es_API.xml'],
- output : 'api_exec.c',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : files('apiexec.py') + glapi_gen_depends,
- capture : true,
-)
-
-main_marshal_generated_c = custom_target(
- 'marshal_generated.c',
- input : ['gl_marshal.py', 'gl_and_es_API.xml'],
- output : 'marshal_generated.c',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : files('marshal_XML.py') + glapi_gen_depends,
- capture : true,
-)
-
-glx_generated = []
-
-foreach x : [['indirect.c', 'proto'], ['indirect.h', 'init_h'], ['indirect_init.c', 'init_c']]
- glx_generated += custom_target(
- x[0],
- input : ['glX_proto_send.py', 'gl_API.xml'],
- output : x[0],
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@', '-m', x[1]],
- depend_files : glx_gen_depends,
- capture : true,
- )
-endforeach
-
-foreach x : [['indirect_size.h', ['-m', 'size_h', '--header-tag', '_INDIRECT_SIZE_H_']],
- ['indirect_size.c', ['-m', 'size_c']]]
- glx_generated += custom_target(
- x[0],
- input : ['glX_proto_size.py', 'gl_API.xml'],
- output : x[0],
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@', '--only-set', x[1]],
- depend_files : glx_gen_depends,
- capture : true,
- )
-endforeach
-glx_indirect_size_h = glx_generated[3]
-
-glapi_x86_s = custom_target(
- 'glapi_x86.S',
- input : ['gl_x86_asm.py', gl_and_es_api_files],
- output : 'glapi_x86.S',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-glapi_x86_64_s = custom_target(
- 'glapi_x86-64.S',
- input : ['gl_x86-64_asm.py', gl_and_es_api_files],
- output : 'glapi_x86-64.S',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-glapi_sparc_s = custom_target(
- 'glapi_sparc.S',
- input : ['gl_SPARC_asm.py', gl_and_es_api_files],
- output : 'glapi_sparc.S',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
deleted file mode 100644
index d3e070d0d1a..00000000000
--- a/src/mapi/glapi/meson.build
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright © 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 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.
-
-inc_glapi = include_directories('.')
-
-static_glapi_files = []
-static_glapi_args = []
-
-if with_appledri or with_windowsdri
- static_glapi_files += files('glapi_gentable.c')
-endif
-
-if with_shared_glapi
- static_glapi_files += files(
- '../entry.c',
- '../entry.h',
- '../entry_x86-64_tls.h',
- '../entry_x86_tls.h',
- '../entry_x86_tsd.h',
- '../entry_ppc64le_tls.h',
- '../entry_ppc64le_tsd.h',
- '../mapi_tmp.h',
- )
- static_glapi_files += glapi_mapi_tmp_h
- static_glapi_args += [
- '-DMAPI_MODE_BRIDGE',
- '-DMAPI_ABI_HEADER="@0@"'.format(glapi_mapi_tmp_h.full_path()),
- ]
-else
- static_glapi_args += '-DMAPI_MODE_UTIL'
- static_glapi_files += files(
- 'glapi_dispatch.c',
- 'glapi_entrypoint.c',
- 'glapi_getproc.c',
- 'glapi_nop.c',
- 'glapi.c',
- 'glapi.h',
- 'glapi_priv.h',
- )
- static_glapi_files += files_mapi_util
- if with_asm_arch == 'x86'
- static_glapi_files += glapi_x86_s
- elif with_asm_arch == 'x86_64'
- static_glapi_files += glapi_x86_64_s
- endif
- # TODO: SPARC asm
-endif
-
-libglapi_static = static_library(
- 'glapi_static',
- static_glapi_files,
- include_directories : [inc_mesa, inc_include, inc_src],
- c_args : [c_msvc_compat_args, static_glapi_args],
- dependencies : [dep_thread, dep_selinux],
- build_by_default : false,
-)
-
-if not with_shared_glapi and with_tests
- glapi_static_check_table = executable(
- 'glapi_static_check_table',
- 'tests/check_table.cpp',
- link_with : [libglapi_static],
- dependencies : [idep_gtest],
- )
-
- test('glapi_static_check_table', glapi_static_check_table)
-endif
diff --git a/src/mapi/meson.build b/src/mapi/meson.build
deleted file mode 100644
index ce94ee4b27a..00000000000
--- a/src/mapi/meson.build
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright © 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 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.
-
-files_mapi_util = files(
- 'u_current.c',
- 'u_current.h',
- 'u_execmem.c',
- 'u_execmem.h',
-)
-
-if with_shared_glapi
- subdir('shared-glapi')
-endif
-subdir('glapi')
-if with_gles1
- subdir('es1api')
-endif
-if with_gles2
- subdir('es2api')
-endif
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
deleted file mode 100644
index 0d88de0545f..00000000000
--- a/src/mapi/shared-glapi/meson.build
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 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 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.
-
-files_mapi_glapi = files(
- '../entry.c',
- '../mapi_glapi.c',
- '../stub.c',
- '../stub.h',
- '../table.c',
- '../table.h',
-)
-
-shared_glapi_mapi_tmp_h = custom_target(
- 'shared_glapi_mapi_tmp.h',
- input : ['../mapi_abi.py', gl_and_es_api_files],
- output : 'glapi_mapi_tmp.h',
- command : [prog_python2, '@INPUT0@', '--printer', 'shared-glapi', '@INPUT1@'],
- depend_files : api_xml_files,
- capture : true,
-)
-
-libglapi = shared_library(
- 'glapi',
- [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
- c_args : [c_msvc_compat_args, '-DMAPI_MODE_GLAPI',
- '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path())],
- link_args : [ld_args_gc_sections],
- include_directories : [inc_src, inc_include, inc_mapi],
- dependencies : [dep_thread, dep_selinux],
- install : true,
-)
-
-if with_tests
- shared_glapi_test = executable(
- ['shared-glapi-test', glapitable_h],
- 'tests/check_table.cpp',
- cpp_args : [cpp_msvc_compat_args],
- include_directories : [inc_src, inc_include, inc_mapi],
- link_with : [libglapi],
- dependencies : [dep_thread, idep_gtest],
- )
-
- test('shared-glapi-test', shared_glapi_test)
-endif
diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
deleted file mode 100644
index d9a9abdfb7a..00000000000
--- a/src/mesa/drivers/dri/common/meson.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 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 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.
-
-inc_dri_common = include_directories('.')
-
-libdricommon = static_library(
- 'dricommon',
- ['utils.c', 'utils.h', 'dri_util.c', 'dri_util.h', xmlpool_options_h],
- include_directories : [inc_common, inc_util],
- c_args : c_vis_args,
- dependencies : dep_libdrm,
- build_by_default : false,
-)
-
-libmegadriver_stub = static_library(
- 'megadriver_stub',
- 'megadriver_stub.c',
- include_directories : inc_common,
- c_args : c_vis_args,
- dependencies : dep_libdrm,
- build_by_default : false,
-)
diff --git a/src/mesa/drivers/dri/i915/meson.build b/src/mesa/drivers/dri/i915/meson.build
deleted file mode 100644
index 1971419a6b7..00000000000
--- a/src/mesa/drivers/dri/i915/meson.build
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright © 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 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.
-
-files_i915 = files(
- 'i830_context.c',
- 'i830_context.h',
- 'i830_reg.h',
- 'i830_state.c',
- 'i830_texblend.c',
- 'i830_texstate.c',
- 'i830_vtbl.c',
- 'i915_context.c',
- 'i915_context.h',
- 'i915_debug_fp.c',
- 'i915_debug.h',
- 'i915_fragprog.c',
- 'i915_program.c',
- 'i915_program.h',
- 'i915_reg.h',
- 'i915_state.c',
- 'i915_tex_layout.c',
- 'i915_texstate.c',
- 'i915_vtbl.c',
- 'intel_batchbuffer.c',
- 'intel_batchbuffer.h',
- 'intel_blit.c',
- 'intel_blit.h',
- 'intel_buffer_objects.c',
- 'intel_buffer_objects.h',
- 'intel_buffers.c',
- 'intel_buffers.h',
- 'intel_chipset.h',
- 'intel_clear.c',
- 'intel_clear.h',
- 'intel_context.c',
- 'intel_context.h',
- 'intel_extensions.c',
- 'intel_extensions.h',
- 'intel_fbo.c',
- 'intel_fbo.h',
- 'intel_mipmap_tree.c',
- 'intel_mipmap_tree.h',
- 'intel_pixel_bitmap.c',
- 'intel_pixel.c',
- 'intel_pixel_copy.c',
- 'intel_pixel_draw.c',
- 'intel_pixel.h',
- 'intel_pixel_read.c',
- 'intel_reg.h',
- 'intel_regions.c',
- 'intel_regions.h',
- 'intel_render.c',
- 'intel_screen.c',
- 'intel_screen.h',
- 'intel_state.c',
- 'intel_syncobj.c',
- 'intel_tex.c',
- 'intel_tex_copy.c',
- 'intel_tex.h',
- 'intel_tex_image.c',
- 'intel_tex_layout.c',
- 'intel_tex_layout.h',
- 'intel_tex_obj.h',
- 'intel_tex_subimage.c',
- 'intel_tex_validate.c',
- 'intel_tris.c',
- 'intel_tris.h',
-)
-
-libi915 = static_library(
- 'i915',
- [files_i915, xmlpool_options_h],
- include_directories : [inc_common, inc_dri_common, inc_util],
- c_args : [c_vis_args, no_override_init_args],
- cpp_args : [cpp_vis_args],
- dependencies : [dep_libdrm, dep_libdrm_intel],
-)
-
-dri_drivers += libi915
-dri_link += 'i915_dri.so'
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
deleted file mode 100644
index 144a254bd64..00000000000
--- a/src/mesa/drivers/dri/i965/meson.build
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright © 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 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.
-
-files_i965 = files(
- 'brw_binding_tables.c',
- 'brw_blorp.c',
- 'brw_blorp.h',
- 'brw_bufmgr.c',
- 'brw_bufmgr.h',
- 'brw_clear.c',
- 'brw_clip.c',
- 'brw_compute.c',
- 'brw_conditional_render.c',
- 'brw_context.c',
- 'brw_context.h',
- 'brw_cs.c',
- 'brw_cs.h',
- 'brw_curbe.c',
- 'brw_defines.h',
- 'brw_draw.c',
- 'brw_draw.h',
- 'brw_draw_upload.c',
- 'brw_ff_gs.c',
- 'brw_ff_gs_emit.c',
- 'brw_ff_gs.h',
- 'brw_formatquery.c',
- 'brw_gs.c',
- 'brw_gs.h',
- 'brw_gs_surface_state.c',
- 'brw_link.cpp',
- 'brw_meta_util.c',
- 'brw_meta_util.h',
- 'brw_misc_state.c',
- 'brw_multisample_state.h',
- 'brw_nir_uniforms.cpp',
- 'brw_object_purgeable.c',
- 'brw_pipe_control.c',
- 'brw_performance_query.h',
- 'brw_performance_query.c',
- 'brw_program.c',
- 'brw_program.h',
- 'brw_program_cache.c',
- 'brw_primitive_restart.c',
- 'brw_queryobj.c',
- 'brw_reset.c',
- 'brw_sf.c',
- 'brw_state.h',
- 'brw_state_upload.c',
- 'brw_structs.h',
- 'brw_surface_formats.c',
- 'brw_sync.c',
- 'brw_tcs.c',
- 'brw_tcs_surface_state.c',
- 'brw_tes.c',
- 'brw_tes_surface_state.c',
- 'brw_urb.c',
- 'brw_util.c',
- 'brw_util.h',
- 'brw_vs.c',
- 'brw_vs.h',
- 'brw_vs_surface_state.c',
- 'brw_wm.c',
- 'brw_wm.h',
- 'brw_wm_surface_state.c',
- 'gen4_blorp_exec.h',
- 'gen6_clip_state.c',
- 'gen6_constant_state.c',
- 'gen6_depth_state.c',
- 'gen6_multisample_state.c',
- 'gen6_queryobj.c',
- 'gen6_sampler_state.c',
- 'gen6_sol.c',
- 'gen6_urb.c',
- 'gen7_l3_state.c',
- 'gen7_misc_state.c',
- 'gen7_sol_state.c',
- 'gen7_urb.c',
- 'gen8_depth_state.c',
- 'gen8_multisample_state.c',
- 'hsw_queryobj.c',
- 'hsw_sol.c',
- 'intel_batchbuffer.c',
- 'intel_batchbuffer.h',
- 'intel_blit.c',
- 'intel_blit.h',
- 'intel_buffer_objects.c',
- 'intel_buffer_objects.h',
- 'intel_buffers.c',
- 'intel_buffers.h',
- 'intel_copy_image.c',
- 'intel_extensions.c',
- 'intel_fbo.c',
- 'intel_fbo.h',
- 'intel_image.h',
- 'intel_mipmap_tree.c',
- 'intel_mipmap_tree.h',
- 'intel_pixel_bitmap.c',
- 'intel_pixel.c',
- 'intel_pixel_copy.c',
- 'intel_pixel_draw.c',
- 'intel_pixel.h',
- 'intel_pixel_read.c',
- 'intel_screen.c',
- 'intel_screen.h',
- 'intel_state.c',
- 'intel_tex.c',
- 'intel_tex_copy.c',
- 'intel_tex.h',
- 'intel_tex_image.c',
- 'intel_tex_obj.h',
- 'intel_tex_validate.c',
- 'intel_tiled_memcpy.c',
- 'intel_tiled_memcpy.h',
- 'intel_upload.c',
- 'libdrm_macros.h',
-)
-
-i965_gen_libs = []
-foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100']
- _lib = static_library(
- 'libi965_gen at 0@'.format(v),
- ['genX_blorp_exec.c', 'genX_state_upload.c', nir_opcodes_h, gen_xml_pack],
- include_directories : [inc_common, inc_intel, inc_dri_common],
- c_args : [c_vis_args, no_override_init_args, '-msse2',
- '-DGEN_VERSIONx10=@0@'.format(v)],
- dependencies : [dep_libdrm],
- )
- i965_gen_libs += _lib
-endforeach
-
-oa_generator = generator(
- prog_python2,
- arguments : ['@CURRENT_SOURCE_DIR@/brw_oa.py', '@INPUT@',
- '--chipset', '@EXTRA_ARGS@', '--code', '@OUTPUT0@',
- '--header', '@OUTPUT1@'],
- output : ['@BASENAME at .c', '@BASENAME at .h'],
-)
-
-i965_oa_sources = []
-foreach hw : ['hsw', 'bdw', 'chv', 'sklgt2', 'sklgt3', 'sklgt4', 'bxt',
- 'kblgt2', 'kblgt3', 'glk']
- _xml = 'brw_oa_ at 0@.xml'.format(hw)
- i965_oa_sources += oa_generator.process(_xml, extra_args : hw)
-endforeach
-
-libi965 = static_library(
- 'i965',
- [files_i965, i965_oa_sources, nir_opcodes_h, ir_expression_operation_h,
- xmlpool_options_h],
- include_directories : [inc_common, inc_intel, inc_dri_common, inc_util,
- inc_drm_uapi, inc_nir],
- c_args : [c_vis_args, no_override_init_args, '-msse2'],
- cpp_args : [cpp_vis_args, '-msse2'],
- link_with : [i965_gen_libs, libintel_common, libisl, libintel_compiler,
- libblorp],
- dependencies : [dep_libdrm, dep_valgrind],
-)
-
-dri_drivers += libi965
-dri_link += 'i965_dri.so'
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
deleted file mode 100644
index 36079324d41..00000000000
--- a/src/mesa/drivers/dri/meson.build
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 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 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.
-
-subdir('common')
-
-dri_drivers = []
-dri_link = []
-if with_dri_swrast
- subdir('swrast')
-endif
-if with_dri_i915
- subdir('i915')
-endif
-if with_dri_i965
- subdir('i965')
-endif
-
-if dri_drivers != []
- libmesa_dri_drivers = shared_library(
- 'mesa_dri_drivers',
- dummy_cpp, # see meson #2180
- link_whole : dri_drivers,
- link_with : [libmegadriver_stub, libdricommon, libxmlconfig, libglapi,
- libmesa_util, libnir, libmesa_classic],
- dependencies : [dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread,
- dep_dl],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections],
- )
-
- pkg.generate(
- name : 'dri',
- filebase : 'dri',
- description : 'Direct Rendering Infrastructure',
- version : meson.project_version(),
- requires_private : ['libdrm >= 2.4.75'], # FIXME: don't hardcode this
- )
-
- meson.add_install_script(
- join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
- libmesa_dri_drivers.full_path(),
- dri_drivers_path,
- dri_link,
- )
-endif
diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build
deleted file mode 100644
index 5ceb1e33e3e..00000000000
--- a/src/mesa/drivers/dri/swrast/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright © 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 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.
-
-libswrast_dri = static_library(
- 'swrast_dri',
- files('swrast.c', 'swrast_priv.h'),
- c_args : [c_vis_args],
- include_directories : [inc_common, inc_dri_common],
- dependencies : dep_libdrm,
-)
-
-dri_drivers += libswrast_dri
-dri_link += 'swrast_dri.so'
diff --git a/src/mesa/main/meson.build b/src/mesa/main/meson.build
deleted file mode 100644
index 57487fe4da5..00000000000
--- a/src/mesa/main/meson.build
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright © 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 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.
-
-main_dispatch_h = custom_target(
- 'dispatch.h',
- input : [files('../../mapi/glapi/gen/gl_table.py'), gl_and_es_api_files],
- output : 'dispatch.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@', '-m', 'remap_table'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
-
-main_marshal_generated_h = custom_target(
- 'marshal_generated.h',
- input : [files('../../mapi/glapi/gen/gl_marshal_h.py'), gl_and_es_api_files],
- output : 'marshal_generated.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : files('../../mapi/glapi/gen/marshal_XML.py') + glapi_gen_depends,
- capture : true,
-)
-
-main_remap_helper_h = custom_target(
- 'remap_helper.h',
- input : [files('../../mapi/glapi/gen/remap_helper.py'), gl_and_es_api_files],
- output : 'remap_helper.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : glapi_gen_depends,
- capture : true,
-)
diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build
deleted file mode 100644
index 2c1d8e067e8..00000000000
--- a/src/mesa/main/tests/meson.build
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright © 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 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.
-
-files_main_test = files('enum_strings.cpp')
-link_main_test = []
-
-if with_shared_glapi
- files_main_test += files(
- 'dispatch_sanity.cpp',
- 'mesa_formats.cpp',
- 'mesa_extensions.cpp',
- 'program_state_string.cpp',
- )
- link_main_test += libglapi
-else
- files_main_test += files('stub.cpp')
-endif
-
-test('main-test', executable(
- 'main_test',
- [files_main_test, main_dispatch_h],
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
- dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread],
- link_with : [libmesa_classic, link_main_test],
- )
-)
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
deleted file mode 100644
index 846a40da822..00000000000
--- a/src/mesa/meson.build
+++ /dev/null
@@ -1,723 +0,0 @@
-# Copyright © 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 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.
-
-# TODO: main/tests
-# TODO: xlib_glx
-# TODO: osmesa
-# TODO: asm_offsets
-
-subdir('program')
-subdir('main')
-
-# program files
-# program nir files
-# files shared between classic mesa and gallium mesa
-files_libmesa_common = files(
- 'program/arbprogparse.c',
- 'program/arbprogparse.h',
- 'program/ir_to_mesa.cpp',
- 'program/ir_to_mesa.h',
- 'program/prog_cache.c',
- 'program/prog_cache.h',
- 'program/prog_execute.c',
- 'program/prog_execute.h',
- 'program/prog_instruction.c',
- 'program/prog_instruction.h',
- 'program/prog_noise.c',
- 'program/prog_noise.h',
- 'program/prog_opt_constant_fold.c',
- 'program/prog_optimize.c',
- 'program/prog_optimize.h',
- 'program/prog_parameter.c',
- 'program/prog_parameter.h',
- 'program/prog_parameter_layout.c',
- 'program/prog_parameter_layout.h',
- 'program/prog_print.c',
- 'program/prog_print.h',
- 'program/program.c',
- 'program/program.h',
- 'program/programopt.c',
- 'program/programopt.h',
- 'program/program_parse_extra.c',
- 'program/program_parser.h',
- 'program/prog_statevars.c',
- 'program/prog_statevars.h',
- 'program/symbol_table.c',
- 'program/symbol_table.h',
- 'program/prog_to_nir.c',
- 'program/prog_to_nir.h',
- 'main/accum.c',
- 'main/accum.h',
- 'main/api_arrayelt.c',
- 'main/api_arrayelt.h',
- 'main/api_exec.h',
- 'main/api_loopback.c',
- 'main/api_loopback.h',
- 'main/api_validate.c',
- 'main/api_validate.h',
- 'main/arbprogram.c',
- 'main/arbprogram.h',
- 'main/arrayobj.c',
- 'main/arrayobj.h',
- 'main/atifragshader.c',
- 'main/atifragshader.h',
- 'main/attrib.c',
- 'main/attrib.h',
- 'main/barrier.c',
- 'main/barrier.h',
- 'main/bbox.c',
- 'main/bbox.h',
- 'main/blend.c',
- 'main/blend.h',
- 'main/blit.c',
- 'main/blit.h',
- 'main/bufferobj.c',
- 'main/bufferobj.h',
- 'main/buffers.c',
- 'main/buffers.h',
- 'main/clear.c',
- 'main/clear.h',
- 'main/clip.c',
- 'main/clip.h',
- 'main/colormac.h',
- 'main/colortab.c',
- 'main/colortab.h',
- 'main/compute.c',
- 'main/compute.h',
- 'main/compiler.h',
- 'main/condrender.c',
- 'main/condrender.h',
- 'main/config.h',
- 'main/context.c',
- 'main/context.h',
- 'main/convolve.c',
- 'main/convolve.h',
- 'main/copyimage.c',
- 'main/copyimage.h',
- 'main/core.h',
- 'main/cpuinfo.c',
- 'main/cpuinfo.h',
- 'main/dd.h',
- 'main/debug.c',
- 'main/debug.h',
- 'main/debug_output.c',
- 'main/debug_output.h',
- 'main/depth.c',
- 'main/depth.h',
- 'main/dlist.c',
- 'main/dlist.h',
- 'main/drawpix.c',
- 'main/drawpix.h',
- 'main/drawtex.c',
- 'main/drawtex.h',
- 'main/enable.c',
- 'main/enable.h',
- 'main/enums.h',
- 'main/errors.c',
- 'main/errors.h',
- 'main/eval.c',
- 'main/eval.h',
- 'main/execmem.c',
- 'main/extensions.c',
- 'main/extensions.h',
- 'main/extensions_table.c',
- 'main/extensions_table.h',
- 'main/externalobjects.c',
- 'main/externalobjects.h',
- 'main/fbobject.c',
- 'main/fbobject.h',
- 'main/feedback.c',
- 'main/feedback.h',
- 'main/ff_fragment_shader.cpp',
- 'main/ffvertex_prog.c',
- 'main/ffvertex_prog.h',
- 'main/fog.c',
- 'main/fog.h',
- 'main/format_pack.h',
- 'main/format_unpack.h',
- 'main/formatquery.c',
- 'main/formatquery.h',
- 'main/formats.c',
- 'main/formats.h',
- 'main/format_utils.c',
- 'main/format_utils.h',
- 'main/framebuffer.c',
- 'main/framebuffer.h',
- 'main/get.c',
- 'main/get.h',
- 'main/genmipmap.c',
- 'main/genmipmap.h',
- 'main/getstring.c',
- 'main/glformats.c',
- 'main/glformats.h',
- 'main/glthread.c',
- 'main/glthread.h',
- 'main/glheader.h',
- 'main/hash.c',
- 'main/hash.h',
- 'main/hint.c',
- 'main/hint.h',
- 'main/histogram.c',
- 'main/histogram.h',
- 'main/image.c',
- 'main/image.h',
- 'main/imports.c',
- 'main/imports.h',
- 'main/light.c',
- 'main/light.h',
- 'main/lines.c',
- 'main/lines.h',
- 'main/macros.h',
- 'main/marshal.c',
- 'main/marshal.h',
- 'main/matrix.c',
- 'main/matrix.h',
- 'main/mipmap.c',
- 'main/mipmap.h',
- 'main/mm.c',
- 'main/mm.h',
- 'main/mtypes.h',
- 'main/multisample.c',
- 'main/multisample.h',
- 'main/objectlabel.c',
- 'main/objectlabel.h',
- 'main/objectpurge.c',
- 'main/objectpurge.h',
- 'main/pack.c',
- 'main/pack.h',
- 'main/pbo.c',
- 'main/pbo.h',
- 'main/performance_monitor.c',
- 'main/performance_monitor.h',
- 'main/performance_query.c',
- 'main/performance_query.h',
- 'main/pipelineobj.c',
- 'main/pipelineobj.h',
- 'main/pixel.c',
- 'main/pixel.h',
- 'main/pixelstore.c',
- 'main/pixelstore.h',
- 'main/pixeltransfer.c',
- 'main/pixeltransfer.h',
- 'main/points.c',
- 'main/points.h',
- 'main/polygon.c',
- 'main/polygon.h',
- 'main/program_resource.c',
- 'main/program_resource.h',
- 'main/querymatrix.c',
- 'main/querymatrix.h',
- 'main/queryobj.c',
- 'main/queryobj.h',
- 'main/rastpos.c',
- 'main/rastpos.h',
- 'main/readpix.c',
- 'main/readpix.h',
- 'main/remap.c',
- 'main/remap.h',
- 'main/renderbuffer.c',
- 'main/renderbuffer.h',
- 'main/robustness.c',
- 'main/samplerobj.c',
- 'main/samplerobj.h',
- 'main/scissor.c',
- 'main/scissor.h',
- 'main/shaderapi.c',
- 'main/shaderapi.h',
- 'main/shaderimage.c',
- 'main/shaderimage.h',
- 'main/shaderobj.c',
- 'main/shaderobj.h',
- 'main/shader_query.cpp',
- 'main/shared.c',
- 'main/shared.h',
- 'main/state.c',
- 'main/state.h',
- 'main/stencil.c',
- 'main/stencil.h',
- 'main/syncobj.c',
- 'main/syncobj.h',
- 'main/texcompress.c',
- 'main/texcompress_bptc.c',
- 'main/texcompress_bptc.h',
- 'main/texcompress_cpal.c',
- 'main/texcompress_cpal.h',
- 'main/texcompress_etc.c',
- 'main/texcompress_etc.h',
- 'main/texcompress_etc_tmp.h',
- 'main/texcompress_fxt1.c',
- 'main/texcompress_fxt1.h',
- 'main/texcompress.h',
- 'main/texcompress_rgtc.c',
- 'main/texcompress_rgtc.h',
- 'main/texcompress_s3tc.c',
- 'main/texcompress_s3tc.h',
- 'main/texenv.c',
- 'main/texenv.h',
- 'main/texenvprogram.h',
- 'main/texformat.c',
- 'main/texformat.h',
- 'main/texgen.c',
- 'main/texgen.h',
- 'main/texgetimage.c',
- 'main/texgetimage.h',
- 'main/teximage.c',
- 'main/teximage.h',
- 'main/texobj.c',
- 'main/texobj.h',
- 'main/texparam.c',
- 'main/texparam.h',
- 'main/texstate.c',
- 'main/texstate.h',
- 'main/texstorage.c',
- 'main/texstorage.h',
- 'main/texstore.c',
- 'main/texstore.h',
- 'main/texturebindless.c',
- 'main/texturebindless.h',
- 'main/textureview.c',
- 'main/textureview.h',
- 'main/transformfeedback.c',
- 'main/transformfeedback.h',
- 'main/uniform_query.cpp',
- 'main/uniforms.c',
- 'main/uniforms.h',
- 'main/varray.c',
- 'main/varray.h',
- 'main/vdpau.c',
- 'main/vdpau.h',
- 'main/version.c',
- 'main/version.h',
- 'main/viewport.c',
- 'main/viewport.h',
- 'main/vtxfmt.c',
- 'main/vtxfmt.h',
- 'main/es1_conversion.c',
- 'main/es1_conversion.h',
- 'math/m_debug.h',
- 'math/m_debug_clip.c',
- 'math/m_debug_norm.c',
- 'math/m_debug_util.h',
- 'math/m_debug_xform.c',
- 'math/m_eval.c',
- 'math/m_eval.h',
- 'math/m_matrix.c',
- 'math/m_matrix.h',
- 'math/m_trans_tmp.h',
- 'math/m_translate.c',
- 'math/m_translate.h',
- 'math/m_vector.c',
- 'math/m_vector.h',
- 'vbo/vbo_attrib.h',
- 'vbo/vbo_attrib_tmp.h',
- 'vbo/vbo_context.c',
- 'vbo/vbo_context.h',
- 'vbo/vbo_exec_api.c',
- 'vbo/vbo_exec_array.c',
- 'vbo/vbo_exec.c',
- 'vbo/vbo_exec_draw.c',
- 'vbo/vbo_exec_eval.c',
- 'vbo/vbo_exec.h',
- 'vbo/vbo.h',
- 'vbo/vbo_minmax_index.c',
- 'vbo/vbo_noop.c',
- 'vbo/vbo_noop.h',
- 'vbo/vbo_primitive_restart.c',
- 'vbo/vbo_rebase.c',
- 'vbo/vbo_save_api.c',
- 'vbo/vbo_save.c',
- 'vbo/vbo_save_draw.c',
- 'vbo/vbo_save.h',
- 'vbo/vbo_save_loopback.c',
- 'vbo/vbo_split.c',
- 'vbo/vbo_split_copy.c',
- 'vbo/vbo_split.h',
- 'vbo/vbo_split_inplace.c',
- 'x86/common_x86.c',
-)
-
-# mesa files
-files_libmesa_classic = files(
- 'math/m_clip_tmp.h',
- 'math/m_copy_tmp.h',
- 'math/m_dotprod_tmp.h',
- 'math/m_norm_tmp.h',
- 'math/m_xform.c',
- 'math/m_xform.h',
- 'math/m_xform_tmp.h',
- 'tnl/t_context.c',
- 'tnl/t_context.h',
- 'tnl/t_draw.c',
- 'tnl/tnl.h',
- 'tnl/t_pipeline.c',
- 'tnl/t_pipeline.h',
- 'tnl/t_vb_cliptmp.h',
- 'tnl/t_vb_fog.c',
- 'tnl/t_vb_light.c',
- 'tnl/t_vb_lighttmp.h',
- 'tnl/t_vb_normals.c',
- 'tnl/t_vb_points.c',
- 'tnl/t_vb_program.c',
- 'tnl/t_vb_render.c',
- 'tnl/t_vb_rendertmp.h',
- 'tnl/t_vb_texgen.c',
- 'tnl/t_vb_texmat.c',
- 'tnl/t_vb_vertex.c',
- 'tnl/t_vertex.c',
- 'tnl/t_vertex_generic.c',
- 'tnl/t_vertex.h',
- 'tnl/t_vertex_sse.c',
- 'tnl/t_vp_build.c',
- 'tnl/t_vp_build.h',
- 'swrast/s_aaline.c',
- 'swrast/s_aaline.h',
- 'swrast/s_aalinetemp.h',
- 'swrast/s_aatriangle.c',
- 'swrast/s_aatriangle.h',
- 'swrast/s_aatritemp.h',
- 'swrast/s_alpha.c',
- 'swrast/s_alpha.h',
- 'swrast/s_atifragshader.c',
- 'swrast/s_atifragshader.h',
- 'swrast/s_bitmap.c',
- 'swrast/s_blend.c',
- 'swrast/s_blend.h',
- 'swrast/s_blit.c',
- 'swrast/s_chan.h',
- 'swrast/s_clear.c',
- 'swrast/s_context.c',
- 'swrast/s_context.h',
- 'swrast/s_copypix.c',
- 'swrast/s_depth.c',
- 'swrast/s_depth.h',
- 'swrast/s_drawpix.c',
- 'swrast_setup/ss_tritmp.h',
- 'swrast_setup/ss_vb.h',
- 'swrast_setup/swrast_setup.h',
- 'swrast/s_feedback.c',
- 'swrast/s_feedback.h',
- 'swrast/s_fog.c',
- 'swrast/s_fog.h',
- 'swrast/s_fragprog.c',
- 'swrast/s_fragprog.h',
- 'swrast/s_lines.c',
- 'swrast/s_lines.h',
- 'swrast/s_linetemp.h',
- 'swrast/s_logic.c',
- 'swrast/s_logic.h',
- 'swrast/s_masking.c',
- 'swrast/s_masking.h',
- 'swrast/s_points.c',
- 'swrast/s_points.h',
- 'swrast/s_renderbuffer.c',
- 'swrast/s_renderbuffer.h',
- 'swrast/s_span.c',
- 'swrast/s_span.h',
- 'swrast/s_stencil.c',
- 'swrast/s_stencil.h',
- 'swrast/s_texcombine.c',
- 'swrast/s_texcombine.h',
- 'swrast/s_texfetch.c',
- 'swrast/s_texfetch.h',
- 'swrast/s_texfetch_tmp.h',
- 'swrast/s_texfilter.c',
- 'swrast/s_texfilter.h',
- 'swrast/s_texrender.c',
- 'swrast/s_texture.c',
- 'swrast/s_triangle.c',
- 'swrast/s_triangle.h',
- 'swrast/s_tritemp.h',
- 'swrast/swrast.h',
- 'swrast/s_zoom.c',
- 'swrast/s_zoom.h',
- 'swrast_setup/ss_context.c',
- 'swrast_setup/ss_context.h',
- 'swrast_setup/ss_triangle.c',
- 'swrast_setup/ss_triangle.h',
- 'drivers/common/driverfuncs.c',
- 'drivers/common/driverfuncs.h',
- 'drivers/common/meta_blit.c',
- 'drivers/common/meta_generate_mipmap.c',
- 'drivers/common/meta.c',
- 'drivers/common/meta.h',
- 'x86/x86_xform.c',
- 'x86/3dnow.c',
- 'x86/sse.c',
- 'x86/rtasm/x86sse.c',
- 'x86/rtasm/x86sse.h',
- 'sparc/sparc.c',
- 'x86-64/x86-64.c',
-)
-
-files_libmesa_gallium = files(
- 'state_tracker/st_atifs_to_tgsi.c',
- 'state_tracker/st_atifs_to_tgsi.h',
- 'state_tracker/st_atom_array.c',
- 'state_tracker/st_atom_atomicbuf.c',
- 'state_tracker/st_atom_blend.c',
- 'state_tracker/st_atom.c',
- 'state_tracker/st_atom_clip.c',
- 'state_tracker/st_atom_constbuf.c',
- 'state_tracker/st_atom_constbuf.h',
- 'state_tracker/st_atom_depth.c',
- 'state_tracker/st_atom_framebuffer.c',
- 'state_tracker/st_atom.h',
- 'state_tracker/st_atom_list.h',
- 'state_tracker/st_atom_image.c',
- 'state_tracker/st_atom_msaa.c',
- 'state_tracker/st_atom_pixeltransfer.c',
- 'state_tracker/st_atom_rasterizer.c',
- 'state_tracker/st_atom_sampler.c',
- 'state_tracker/st_atom_scissor.c',
- 'state_tracker/st_atom_shader.c',
- 'state_tracker/st_atom_shader.h',
- 'state_tracker/st_atom_stipple.c',
- 'state_tracker/st_atom_storagebuf.c',
- 'state_tracker/st_atom_tess.c',
- 'state_tracker/st_atom_texture.c',
- 'state_tracker/st_atom_viewport.c',
- 'state_tracker/st_cb_bitmap.c',
- 'state_tracker/st_cb_bitmap.h',
- 'state_tracker/st_cb_bitmap_shader.c',
- 'state_tracker/st_cb_blit.c',
- 'state_tracker/st_cb_blit.h',
- 'state_tracker/st_cb_bufferobjects.c',
- 'state_tracker/st_cb_bufferobjects.h',
- 'state_tracker/st_cb_clear.c',
- 'state_tracker/st_cb_clear.h',
- 'state_tracker/st_cb_compute.c',
- 'state_tracker/st_cb_compute.h',
- 'state_tracker/st_cb_condrender.c',
- 'state_tracker/st_cb_condrender.h',
- 'state_tracker/st_cb_copyimage.c',
- 'state_tracker/st_cb_copyimage.h',
- 'state_tracker/st_cb_drawpixels.c',
- 'state_tracker/st_cb_drawpixels.h',
- 'state_tracker/st_cb_drawpixels_shader.c',
- 'state_tracker/st_cb_drawtex.c',
- 'state_tracker/st_cb_drawtex.h',
- 'state_tracker/st_cb_eglimage.c',
- 'state_tracker/st_cb_eglimage.h',
- 'state_tracker/st_cb_fbo.c',
- 'state_tracker/st_cb_fbo.h',
- 'state_tracker/st_cb_feedback.c',
- 'state_tracker/st_cb_feedback.h',
- 'state_tracker/st_cb_flush.c',
- 'state_tracker/st_cb_flush.h',
- 'state_tracker/st_cb_memoryobjects.c',
- 'state_tracker/st_cb_memoryobjects.h',
- 'state_tracker/st_cb_msaa.c',
- 'state_tracker/st_cb_msaa.h',
- 'state_tracker/st_cb_perfmon.c',
- 'state_tracker/st_cb_perfmon.h',
- 'state_tracker/st_cb_program.c',
- 'state_tracker/st_cb_program.h',
- 'state_tracker/st_cb_queryobj.c',
- 'state_tracker/st_cb_queryobj.h',
- 'state_tracker/st_cb_rasterpos.c',
- 'state_tracker/st_cb_rasterpos.h',
- 'state_tracker/st_cb_readpixels.c',
- 'state_tracker/st_cb_readpixels.h',
- 'state_tracker/st_cb_strings.c',
- 'state_tracker/st_cb_strings.h',
- 'state_tracker/st_cb_syncobj.c',
- 'state_tracker/st_cb_syncobj.h',
- 'state_tracker/st_cb_texturebarrier.c',
- 'state_tracker/st_cb_texturebarrier.h',
- 'state_tracker/st_cb_texture.c',
- 'state_tracker/st_cb_texture.h',
- 'state_tracker/st_cb_viewport.c',
- 'state_tracker/st_cb_viewport.h',
- 'state_tracker/st_cb_xformfb.c',
- 'state_tracker/st_cb_xformfb.h',
- 'state_tracker/st_context.c',
- 'state_tracker/st_context.h',
- 'state_tracker/st_copytex.c',
- 'state_tracker/st_copytex.h',
- 'state_tracker/st_debug.c',
- 'state_tracker/st_debug.h',
- 'state_tracker/st_draw.c',
- 'state_tracker/st_draw_feedback.c',
- 'state_tracker/st_draw.h',
- 'state_tracker/st_extensions.c',
- 'state_tracker/st_extensions.h',
- 'state_tracker/st_format.c',
- 'state_tracker/st_format.h',
- 'state_tracker/st_gen_mipmap.c',
- 'state_tracker/st_gen_mipmap.h',
- 'state_tracker/st_gl_api.h',
- 'state_tracker/st_glsl_to_nir.cpp',
- 'state_tracker/st_glsl_to_tgsi.cpp',
- 'state_tracker/st_glsl_to_tgsi.h',
- 'state_tracker/st_glsl_to_tgsi_private.cpp',
- 'state_tracker/st_glsl_to_tgsi_private.h',
- 'state_tracker/st_glsl_to_tgsi_temprename.cpp',
- 'state_tracker/st_glsl_to_tgsi_temprename.h',
- 'state_tracker/st_glsl_types.cpp',
- 'state_tracker/st_glsl_types.h',
- 'state_tracker/st_manager.c',
- 'state_tracker/st_manager.h',
- 'state_tracker/st_mesa_to_tgsi.c',
- 'state_tracker/st_mesa_to_tgsi.h',
- 'state_tracker/st_nir.h',
- 'state_tracker/st_nir_lower_builtin.c',
- 'state_tracker/st_nir_lower_tex_src_plane.c',
- 'state_tracker/st_pbo.c',
- 'state_tracker/st_pbo.h',
- 'state_tracker/st_program.c',
- 'state_tracker/st_program.h',
- 'state_tracker/st_sampler_view.c',
- 'state_tracker/st_sampler_view.h',
- 'state_tracker/st_scissor.c',
- 'state_tracker/st_scissor.h',
- 'state_tracker/st_shader_cache.c',
- 'state_tracker/st_shader_cache.h',
- 'state_tracker/st_texture.c',
- 'state_tracker/st_texture.h',
- 'state_tracker/st_tgsi_lower_yuv.c',
- 'state_tracker/st_tgsi_lower_yuv.h',
- 'state_tracker/st_vdpau.c',
- 'state_tracker/st_vdpau.h',
-)
-
-# TODO: sse41
-libmesa_sse41 = []
-
-matypes_h = []
-if with_asm_arch == 'x86' or with_asm_arch == 'x86_64'
- gen_matypes = executable(
- 'gen_matypes',
- 'x86/gen_matypes.c',
- c_args : [c_vis_args, c_msvc_compat_args],
- include_directories : inc_common,
- )
- matypes_h = custom_target(
- 'matypes.h',
- output : 'matypes.h',
- command : [gen_matypes],
- capture : true,
- )
-endif
-if with_asm_arch == 'x86'
- files_libmesa_common += files(
- 'x86/assyntax.h',
- 'x86/clip_args.h',
- 'x86/norm_args.h',
- 'x86/xform_args.h',
- 'x86/common_x86_asm.S',
- 'x86/common_x86_asm.h',
- 'x86/common_x86_features.h',
- 'x86/x86_xform.h',
- 'x86/x86_xform2.S',
- 'x86/x86_xform3.S',
- 'x86/x86_xform4.S',
- 'x86/x86_cliptest.S',
- 'x86/mmx.h',
- 'x86/mmx_blend.S',
- 'x86/mmx_blendtmp.h',
- 'x86/3dnow.h',
- 'x86/3dnow_xform1.S',
- 'x86/3dnow_xform2.S',
- 'x86/3dnow_xform3.S',
- 'x86/3dnow_xform4.S',
- 'x86/sse.h',
- 'x86/sse_xform1.S',
- 'x86/sse_xform2.S',
- 'x86/sse_xform3.S',
- 'x86/sse_xform4.S',
- 'x86/sse_normal.S',
- 'x86/read_rgba_span_x86.S',
- )
-elif with_asm_arch == 'x86_64'
- files_libmesa_common += files('x86-64/x86-64.h', 'x86-64/xform4.S')
-endif
-# TODO: sparc
-
-format_fallback_c = custom_target(
- 'format_fallback.c',
- input : ['main/format_fallback.py', 'main/formats.csv'],
- output : 'format_fallback.c',
- command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'],
- depend_files : files('main/format_parser.py'),
-)
-
-get_hash_h = custom_target(
- 'get_hash.h',
- input : ['main/get_hash_generator.py', gl_and_es_api_files],
- output : 'get_hash.h',
- command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'],
- depend_files : files('main/get_hash_params.py'),
- capture : true,
-)
-
-foreach x : [['format_info.h', 'format_info.py'],
- ['format_pack.c', 'format_pack.py'],
- ['format_unpack.c', 'format_unpack.py']]
- files_libmesa_common += custom_target(
- x[0],
- input : ['main/@0@'.format(x[1]), 'main/formats.csv'],
- output : x[0],
- command : [prog_python2, '@INPUT0@', '@INPUT1@'],
- depend_files : files('main/format_parser.py'),
- capture : true,
- )
-endforeach
-
-files_libmesa_common += [
- mesa_lex,
- program_parse_tab,
- main_api_exec_c,
- main_enums_c,
- format_fallback_c,
- get_hash_h,
- main_marshal_generated_c,
- main_marshal_generated_h,
- main_dispatch_h,
- ir_expression_operation_h,
- nir_opcodes_h,
- main_remap_helper_h,
- matypes_h,
- sha1_h,
-]
-
-libmesa_classic = static_library(
- 'mesa_classic',
- [files_libmesa_common, files_libmesa_classic],
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common, include_directories('main')],
- link_with : [libglsl, libmesa_sse41],
- build_by_default : false,
-)
-
-libmesa_gallium = static_library(
- 'mesa_gallium',
- [files_libmesa_common, files_libmesa_gallium],
- c_args : [c_vis_args, c_msvc_compat_args],
- cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
- include_directories : [inc_common, include_directories('main')],
- link_with : [libglsl, libmesa_sse41],
- build_by_default : false,
-)
-
-subdir('drivers/dri')
-if with_tests
- subdir('main/tests')
-endif
diff --git a/src/mesa/program/meson.build b/src/mesa/program/meson.build
deleted file mode 100644
index 5f3325ff53c..00000000000
--- a/src/mesa/program/meson.build
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 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 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.
-
-mesa_lex = custom_target(
- 'mesa_lex',
- input : 'program_lexer.l',
- output : 'lex.yy.c',
- command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
-)
-
-program_parse_tab = custom_target(
- 'program_parse_tab.[ch]',
- input : 'program_parse.y',
- output : ['program_parse.tab.c', 'program_parse.tab.h'],
- command : [prog_bison, '-o', '@OUTPUT0@', '--defines=@OUTPUT1@', '@INPUT@'],
-)
diff --git a/src/meson.build b/src/meson.build
deleted file mode 100644
index 9b1b0ae594d..00000000000
--- a/src/meson.build
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright © 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 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.
-
-inc_common = include_directories(
- '../include', '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')
-inc_mesa = include_directories('mesa')
-inc_mapi = include_directories('mapi')
-inc_src = include_directories('.')
-
-libglsl_util = static_library(
- 'glsl_util',
- files('mesa/main/extensions_table.c', 'mesa/main/imports.c',
- 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
- 'mesa/program/dummy_errors.c'),
- include_directories : [inc_common],
- c_args : [c_vis_args],
- build_by_default : false,
-)
-
-sha1_h = vcs_tag(
- input : 'git_sha1.h.in',
- output : 'git_sha1.h',
-)
-
-subdir('gtest')
-subdir('util')
-subdir('mapi/glapi/gen')
-subdir('mapi')
-# TODO: opengl
-# TODO: osmesa
-subdir('compiler')
-subdir('egl/wayland/wayland-drm')
-subdir('vulkan')
-subdir('amd')
-if with_gallium_vc4
- subdir('broadcom')
-endif
-subdir('intel')
-subdir('mesa')
-subdir('loader')
-subdir('glx')
-if with_platform_wayland
- subdir('egl/wayland/wayland-egl')
-endif
-if with_gbm
- subdir('gbm')
-endif
-if with_egl
- subdir('egl')
-endif
-subdir('gallium')
diff --git a/src/util/meson.build b/src/util/meson.build
deleted file mode 100644
index c9cb3e861e9..00000000000
--- a/src/util/meson.build
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright © 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 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.
-
-inc_util = include_directories('.')
-
-subdir('xmlpool')
-
-files_mesa_util = files(
- 'bitscan.c',
- 'bitscan.h',
- 'bitset.h',
- 'build_id.c',
- 'build_id.h',
- 'crc32.c',
- 'crc32.h',
- 'debug.c',
- 'debug.h',
- 'disk_cache.c',
- 'disk_cache.h',
- 'format_r11g11b10f.h',
- 'format_rgb9e5.h',
- 'format_srgb.h',
- 'half_float.c',
- 'half_float.h',
- 'hash_table.c',
- 'hash_table.h',
- 'list.h',
- 'macros.h',
- 'mesa-sha1.c',
- 'mesa-sha1.h',
- 'sha1/sha1.c',
- 'sha1/sha1.h',
- 'ralloc.c',
- 'ralloc.h',
- 'rand_xor.c',
- 'rand_xor.h',
- 'register_allocate.c',
- 'register_allocate.h',
- 'rgtc.c',
- 'rgtc.h',
- 'rounding.h',
- 'set.c',
- 'set.h',
- 'simple_list.h',
- 'slab.c',
- 'slab.h',
- 'string_buffer.c',
- 'string_buffer.h',
- 'strndup.h',
- 'strtod.c',
- 'strtod.h',
- 'texcompress_rgtc_tmp.h',
- 'u_atomic.c',
- 'u_atomic.h',
- 'u_dynarray.h',
- 'u_endian.h',
- 'u_queue.c',
- 'u_queue.h',
- 'u_string.h',
- 'u_thread.h',
- 'u_vector.c',
- 'u_vector.h',
-)
-
-install_data('drirc', install_dir : get_option('sysconfdir'))
-
-files_xmlconfig = files(
- 'xmlconfig.c',
- 'xmlconfig.h',
-)
-
-format_srgb = custom_target(
- 'format_srgb',
- input : ['format_srgb.py'],
- output : 'format_srgb.c',
- command : [prog_python2, '@INPUT0@'],
- capture : true,
-)
-
-libmesa_util = static_library(
- 'mesa_util',
- [files_mesa_util, format_srgb],
- include_directories : inc_common,
- dependencies : [dep_zlib, dep_clock],
- c_args : [c_msvc_compat_args, c_vis_args],
- build_by_default : false
-)
-
-libxmlconfig = static_library(
- 'xmlconfig',
- files_xmlconfig,
- include_directories : inc_common,
- dependencies : [dep_expat, dep_m],
- c_args : [c_msvc_compat_args, c_vis_args,
- '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))],
- build_by_default : false,
-)
-
-if with_tests
- u_atomic_test = executable(
- 'u_atomic_test',
- files('u_atomic_test.c'),
- include_directories : inc_common,
- link_with : libmesa_util,
- c_args : [c_msvc_compat_args],
- )
-
- roundeven_test = executable(
- 'roundeven_test',
- files('roundeven_test.c'),
- include_directories : inc_common,
- c_args : [c_msvc_compat_args],
- dependencies : [dep_m],
- )
-
- test('u_atomic', u_atomic_test)
- test('roundeven', roundeven_test)
-
- subdir('tests/hash_table')
- subdir('tests/string_buffer')
-endif
diff --git a/src/util/tests/hash_table/meson.build b/src/util/tests/hash_table/meson.build
deleted file mode 100644
index 43d8f43a83e..00000000000
--- a/src/util/tests/hash_table/meson.build
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 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 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.
-
-foreach t : ['clear', 'collision', 'delete_and_lookup', 'delete_management',
- 'destroy_callback', 'insert_and_lookup', 'insert_many',
- 'null_destroy', 'random_entry', 'remove_null', 'replacement']
- _test = executable(
- '@0 at _test'.format(t),
- files('@0 at .c'.format(t)),
- dependencies : [dep_thread, dep_dl],
- include_directories : [inc_include, inc_util],
- link_with : libmesa_util,
- )
- test(t, _test)
-endforeach
diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build
deleted file mode 100644
index 14dbebca7d8..00000000000
--- a/src/util/tests/string_buffer/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 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 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.
-
-string_buffer_test = executable(
- 'string_buffer_test',
- 'string_buffer_test.cpp',
- dependencies : [dep_thread, dep_dl, idep_gtest],
- include_directories : inc_common,
- link_with : [libmesa_util],
-)
-
-test('string_buffer', string_buffer_test)
diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
deleted file mode 100644
index 97693fac8c4..00000000000
--- a/src/util/xmlpool/meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 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 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.
-
-xmlpool_options_h = custom_target(
- 'xmlpool_options.h',
- input : ['gen_xmlpool.py', 't_options.h'],
- output : 'options.h',
- command : [prog_python2, '@INPUT@', meson.current_source_dir()],
- capture : true,
- depend_files : files('ca.po', 'es.po', 'de.po', 'nl.po', 'sv.po', 'fr.po'),
-)
diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
deleted file mode 100644
index 3908005b8a0..00000000000
--- a/src/vulkan/meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright © 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 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.
-
-vk_api_xml = files('registry/vk.xml')
-vk_android_native_buffer_xml = files('registry/vk_android_native_buffer.xml')
-
-inc_vulkan_util = include_directories('util')
-inc_vulkan_wsi = include_directories('wsi')
-
-subdir('util')
-subdir('wsi')
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
deleted file mode 100644
index 6b0ec1e5ef4..00000000000
--- a/src/vulkan/util/meson.build
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright © 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 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.
-
-files_vulkan_util = files(
- 'vk_alloc.h',
- 'vk_util.c',
- 'vk_util.h',
-)
-
-vk_enum_to_str = custom_target(
- 'vk_enum_to_str',
- input : ['gen_enum_to_str.py', vk_api_xml[0]],
- output : ['vk_enum_to_str.c', 'vk_enum_to_str.h'],
- command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--outdir', meson.current_build_dir()],
-)
-
-libvulkan_util = static_library(
- 'vulkan_util',
- [files_vulkan_util, vk_enum_to_str],
- include_directories : [inc_common, inc_vulkan],
- c_args : [c_vis_args],
- build_by_default : false,
-)
diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
deleted file mode 100644
index 3aa02d5e63f..00000000000
--- a/src/vulkan/wsi/meson.build
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright © 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 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.
-
-vulkan_wsi_args = []
-vulkan_wsi_deps = []
-
-files_vulkan_wsi = files(
- 'wsi_common.h',
- 'wsi_common_queue.h',
-)
-if with_platform_x11
- vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
- vulkan_wsi_deps += [
- dep_xcb,
- dep_x11_xcb,
- dep_xcb_dri2,
- dep_xcb_dri3,
- dep_xcb_present,
- dep_xcb_sync,
- dep_xshmfence,
- ]
- files_vulkan_wsi += files(
- 'wsi_common_x11.c',
- 'wsi_common_x11.h',
- )
-endif
-
-if with_platform_wayland
- vulkan_wsi_deps += dep_wayland_client
- vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR']
- files_vulkan_wsi += files(
- 'wsi_common_wayland.c',
- 'wsi_common_wayland.h',
- )
- files_vulkan_wsi += [
- wayland_drm_client_protocol_h,
- wayland_drm_protocol_c,
- ]
-endif
-
-libvulkan_wsi = static_library(
- 'vulkan_wsi',
- files_vulkan_wsi,
- include_directories : [inc_common, inc_vulkan_util],
- dependencies : [vulkan_wsi_deps, dep_libdrm],
- c_args : [c_vis_args, vulkan_wsi_args],
- build_by_default : false,
-)
--
2.15.0
More information about the mesa-stable
mailing list