diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/swrast/meson.build | 30 |
4 files changed, 36 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 79ee1a33459..bff40f697d3 100644 --- a/meson.build +++ b/meson.build @@ -73,10 +73,12 @@ endif with_dri = false with_dri_i965 = false +with_dri_swrast = false _drivers = get_option('dri-drivers') if _drivers != '' _split = _drivers.split(',') with_dri_i965 = _split.contains('i965') + with_dri_swrast = _split.contains('swrast') with_dri = true endif diff --git a/meson_options.txt b/meson_options.txt index 6dde267de95..029626d69a4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,7 +22,7 @@ option('platforms', type : 'string', value : 'x11,wayland', 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 : 'i965', +option('dri-drivers', type : 'string', value : 'swrast,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.') diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 9e0e9638aa4..cc2272eff6d 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -22,6 +22,9 @@ subdir('common') dri_drivers = [] dri_link = [] +if with_dri_swrast + subdir('swrast') +endif if with_dri_i965 subdir('i965') endif diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build new file mode 100644 index 00000000000..5ceb1e33e3e --- /dev/null +++ b/src/mesa/drivers/dri/swrast/meson.build @@ -0,0 +1,30 @@ +# 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' |