From 4d701ee9696ff7fdbce5c56cc3a97a326f06f16f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 29 Sep 2017 20:21:23 -0700 Subject: [PATCH] meson: build gallium helper drivers This builds ddebug, noop, rbug, and trace drivers. Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- src/gallium/drivers/ddebug/meson.build | 28 +++++++++++++++++++++++++ src/gallium/drivers/noop/meson.build | 27 ++++++++++++++++++++++++ src/gallium/drivers/rbug/meson.build | 28 +++++++++++++++++++++++++ src/gallium/drivers/trace/meson.build | 29 ++++++++++++++++++++++++++ src/gallium/meson.build | 4 ++++ 5 files changed, 116 insertions(+) create mode 100644 src/gallium/drivers/ddebug/meson.build create mode 100644 src/gallium/drivers/noop/meson.build create mode 100644 src/gallium/drivers/rbug/meson.build create mode 100644 src/gallium/drivers/trace/meson.build diff --git a/src/gallium/drivers/ddebug/meson.build b/src/gallium/drivers/ddebug/meson.build new file mode 100644 index 00000000000..09ede3d04d4 --- /dev/null +++ b/src/gallium/drivers/ddebug/meson.build @@ -0,0 +1,28 @@ +# 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/noop/meson.build b/src/gallium/drivers/noop/meson.build new file mode 100644 index 00000000000..c4bb1508e3c --- /dev/null +++ b/src/gallium/drivers/noop/meson.build @@ -0,0 +1,27 @@ +# 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/rbug/meson.build b/src/gallium/drivers/rbug/meson.build new file mode 100644 index 00000000000..9c74171f7b5 --- /dev/null +++ b/src/gallium/drivers/rbug/meson.build @@ -0,0 +1,28 @@ +# 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/trace/meson.build b/src/gallium/drivers/trace/meson.build new file mode 100644 index 00000000000..4fc5d8ba0f6 --- /dev/null +++ b/src/gallium/drivers/trace/meson.build @@ -0,0 +1,29 @@ +# 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/meson.build b/src/gallium/meson.build index 50708d146fc..d69c3aeca39 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -23,3 +23,7 @@ inc_gallium_winsys = include_directories('winsys') subdir('auxiliary') subdir('auxiliary/pipe-loader') +subdir('drivers/ddebug') +subdir('drivers/noop') +subdir('drivers/trace') +subdir('drivers/rbug') -- 2.30.2