From d28c24650110c130008be3d3fe584520ff00ceb1 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 5 Apr 2018 14:39:13 -0700 Subject: [PATCH] meson: build graw tests This only enables the null and xlib target, so no windows support yet. Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- src/gallium/meson.build | 4 +++ src/gallium/targets/graw-null/meson.build | 34 +++++++++++++++++++++ src/gallium/targets/graw-xlib/meson.build | 33 +++++++++++++++++++++ src/gallium/tests/graw/meson.build | 36 +++++++++++++++++++++++ src/gallium/tests/meson.build | 1 + 5 files changed, 108 insertions(+) create mode 100644 src/gallium/targets/graw-null/meson.build create mode 100644 src/gallium/targets/graw-xlib/meson.build create mode 100644 src/gallium/tests/graw/meson.build diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 4468b1906a0..02391728d30 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -192,5 +192,9 @@ if with_gallium_st_nine subdir('targets/d3dadapter9') endif if with_tests + subdir('targets/graw-null') + if with_glx == 'gallium-xlib' + subdir('targets/graw-xlib') + endif subdir('tests') endif diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build new file mode 100644 index 00000000000..8a294f41307 --- /dev/null +++ b/src/gallium/targets/graw-null/meson.build @@ -0,0 +1,34 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice 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. + +libgraw_util = static_library( + 'graw_util', + ['graw_util.c'], + include_directories : inc_common, +) + +libgraw_null = shared_library( + 'graw_null', + ['graw_null.c'], + include_directories : inc_common, + link_with : [libmesa_util, libgallium], +) + +libgraw = libgraw_null diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build new file mode 100644 index 00000000000..4716c543cbc --- /dev/null +++ b/src/gallium/targets/graw-xlib/meson.build @@ -0,0 +1,33 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice 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. + +libgraw_xlib = shared_library( + 'graw_xlib', + ['graw_xlib.c'], + c_args : ['-DGALLIUM_TRACE', '-DGALLIUM_RBUG'], + include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys], + link_with : [ + libgraw_util, libtrace, librbug, libmesa_util, libgallium, libws_xlib + ], + dependencies : [dep_thread, driver_swrast], + version : '1.0', +) + +libgraw = libgraw_xlib diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build new file mode 100644 index 00000000000..fd416c16287 --- /dev/null +++ b/src/gallium/tests/graw/meson.build @@ -0,0 +1,36 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice 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. + +progs = [ + 'clear', 'disasm', 'fs-fragcoord', 'fs-frontface', 'fs-test', 'fs-write-z', + 'gs-test', 'occlusion-query', 'quad-sample', 'quad-tex', 'shader-leak', + 'tex-srgb', 'tex-swizzle', 'tri', 'tri-large', 'tri-gs', 'tri-instanced', + 'vs-test', +] + +foreach t : progs + executable( + 'graw-' + t, + t + '.c', + include_directories : inc_common, + link_with : [libgraw, libgraw_util, libmesa_util, libgallium], + dependencies : [dep_m, dep_thread] + ) +endforeach diff --git a/src/gallium/tests/meson.build b/src/gallium/tests/meson.build index 57e248de117..0ee04350c87 100644 --- a/src/gallium/tests/meson.build +++ b/src/gallium/tests/meson.build @@ -22,3 +22,4 @@ subdir('trivial') if with_gallium_softpipe subdir('unit') endif +subdir('graw') -- 2.30.2