From ec2a59cd7aa42652645e76e29a72335370c80e50 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 10 Jul 2019 10:33:24 -0700 Subject: [PATCH] panfrost: Move non-Gallium files outside of Gallium In preparation for a Panfrost-based non-Gallium driver (maybe Vulkan...?), hoist everything except for the Gallium driver into a shared src/panfrost. Practically, that means the compilers, the headers, and pandecode. Signed-off-by: Alyssa Rosenzweig --- .../drivers/panfrost/include/meson.build | 0 src/gallium/drivers/panfrost/meson.build | 90 +------------------ .../drivers => }/panfrost/bifrost/bifrost.h | 0 .../drivers => }/panfrost/bifrost/cmdline.c | 0 .../panfrost/bifrost/disassemble.c | 0 .../panfrost/bifrost/disassemble.h | 0 src/panfrost/bifrost/meson.build | 33 +++++++ .../panfrost/include/panfrost-job.h | 0 .../panfrost/include/panfrost-misc.h | 0 src/panfrost/meson.build | 60 ++++++++++++- .../drivers => }/panfrost/midgard/compiler.h | 0 .../drivers => }/panfrost/midgard/cppwrap.cpp | 0 .../panfrost/midgard/disassemble.c | 0 .../panfrost/midgard/disassemble.h | 0 .../drivers => }/panfrost/midgard/helpers.h | 0 src/panfrost/midgard/meson.build | 63 +++++++++++++ .../panfrost/midgard/midgard-parse.h | 0 .../drivers => }/panfrost/midgard/midgard.h | 0 .../panfrost/midgard/midgard_compile.c | 0 .../panfrost/midgard/midgard_compile.h | 0 .../panfrost/midgard/midgard_emit.c | 0 .../panfrost/midgard/midgard_liveness.c | 0 .../panfrost/midgard/midgard_nir.h | 0 .../panfrost/midgard/midgard_nir_algebraic.py | 0 .../panfrost/midgard/midgard_ops.c | 0 .../panfrost/midgard/midgard_ops.h | 0 .../panfrost/midgard/midgard_print.c | 0 .../panfrost/midgard/midgard_ra.c | 0 .../panfrost/midgard/midgard_ra_pipeline.c | 0 .../panfrost/midgard/midgard_schedule.c | 0 .../drivers => }/panfrost/midgard/mir.c | 0 .../drivers => }/panfrost/pandecode/cmdline.c | 0 .../drivers => }/panfrost/pandecode/common.c | 0 .../drivers => }/panfrost/pandecode/decode.c | 7 +- .../drivers => }/panfrost/pandecode/decode.h | 0 src/panfrost/pandecode/meson.build | 35 ++++++++ .../pandecode}/pan_pretty_print.c | 0 .../pandecode}/pan_pretty_print.h | 0 38 files changed, 196 insertions(+), 92 deletions(-) delete mode 100644 src/gallium/drivers/panfrost/include/meson.build rename src/{gallium/drivers => }/panfrost/bifrost/bifrost.h (100%) rename src/{gallium/drivers => }/panfrost/bifrost/cmdline.c (100%) rename src/{gallium/drivers => }/panfrost/bifrost/disassemble.c (100%) rename src/{gallium/drivers => }/panfrost/bifrost/disassemble.h (100%) create mode 100644 src/panfrost/bifrost/meson.build rename src/{gallium/drivers => }/panfrost/include/panfrost-job.h (100%) rename src/{gallium/drivers => }/panfrost/include/panfrost-misc.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/compiler.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/cppwrap.cpp (100%) rename src/{gallium/drivers => }/panfrost/midgard/disassemble.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/disassemble.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/helpers.h (100%) create mode 100644 src/panfrost/midgard/meson.build rename src/{gallium/drivers => }/panfrost/midgard/midgard-parse.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_compile.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_compile.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_emit.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_liveness.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_nir.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_nir_algebraic.py (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_ops.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_ops.h (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_print.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_ra.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_ra_pipeline.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/midgard_schedule.c (100%) rename src/{gallium/drivers => }/panfrost/midgard/mir.c (100%) rename src/{gallium/drivers => }/panfrost/pandecode/cmdline.c (100%) rename src/{gallium/drivers => }/panfrost/pandecode/common.c (100%) rename src/{gallium/drivers => }/panfrost/pandecode/decode.c (99%) rename src/{gallium/drivers => }/panfrost/pandecode/decode.h (100%) create mode 100644 src/panfrost/pandecode/meson.build rename src/{gallium/drivers/panfrost => panfrost/pandecode}/pan_pretty_print.c (100%) rename src/{gallium/drivers/panfrost => panfrost/pandecode}/pan_pretty_print.h (100%) diff --git a/src/gallium/drivers/panfrost/include/meson.build b/src/gallium/drivers/panfrost/include/meson.build deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index f3067c6a784..7fdbddc0268 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -26,27 +26,10 @@ files_panfrost = files( 'pan_resource.c', 'pan_resource.h', - 'midgard/midgard_compile.c', - 'midgard/mir.c', - 'midgard/midgard_print.c', - 'midgard/midgard_schedule.c', - 'midgard/midgard_emit.c', - 'midgard/midgard_ra.c', - 'midgard/midgard_ra_pipeline.c', - 'midgard/midgard_liveness.c', - 'midgard/midgard_ops.c', - 'midgard/cppwrap.cpp', - 'midgard/disassemble.c', - 'nir/nir_undef_to_zero.c', 'nir/nir_lower_blend.c', 'nir/nir_lower_framebuffer.c', - 'bifrost/disassemble.c', - - 'pandecode/common.c', - 'pandecode/decode.c', - 'pan_context.c', 'pan_afbc.c', 'pan_blit.c', @@ -58,7 +41,6 @@ files_panfrost = files( 'pan_blending.c', 'pan_blend_shaders.c', 'pan_blend_cso.c', - 'pan_pretty_print.c', 'pan_fragment.c', 'pan_invocation.c', 'pan_instancing.c', @@ -75,9 +57,6 @@ panfrost_includes = [ inc_include, inc_src, inc_panfrost, - include_directories('include'), - include_directories('midgard'), - include_directories('bifrost'), ] compile_args_panfrost = [ @@ -85,21 +64,9 @@ compile_args_panfrost = [ '-Wno-pointer-arith' ] -midgard_nir_algebraic_c = custom_target( - 'midgard_nir_algebraic.c', - input : 'midgard/midgard_nir_algebraic.py', - output : 'midgard_nir_algebraic.c', - command : [ - prog_python, '@INPUT@', - '-p', join_paths(meson.source_root(), 'src/compiler/nir/'), - ], - capture : true, - depend_files : nir_algebraic_py, -) - libpanfrost = static_library( 'panfrost', - [files_panfrost, midgard_nir_algebraic_c], + files_panfrost, dependencies: [ dep_thread, dep_libdrm, @@ -111,58 +78,5 @@ libpanfrost = static_library( driver_panfrost = declare_dependency( compile_args : compile_args_panfrost, - link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared], -) - -files_bifrost = files( - 'bifrost/disassemble.c', - 'bifrost/cmdline.c', -) - -bifrost_compiler = executable( - 'bifrost_compiler', - [files_bifrost], - include_directories : [ - inc_common, - inc_src, - inc_include, - inc_gallium, - inc_gallium_aux, - include_directories('bifrost') - ], - dependencies : [ - dep_thread, - idep_nir - ], - link_with : [ - libgallium, - libglsl_standalone, - libmesa_util - ], - build_by_default : true -) - -files_pandecode = files( - 'pandecode/cmdline.c', - 'pandecode/common.c', - 'pandecode/decode.c', - - 'pan_pretty_print.c', - - 'midgard/disassemble.c', - 'midgard/midgard_ops.c', - 'bifrost/disassemble.c', -) - -pandecode = executable( - 'pandecode', - files_pandecode, - include_directories : panfrost_includes, - dependencies : [ - dep_thread, - ], - link_with : [ - libmesa_util - ], - build_by_default : true + link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode], ) diff --git a/src/gallium/drivers/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h similarity index 100% rename from src/gallium/drivers/panfrost/bifrost/bifrost.h rename to src/panfrost/bifrost/bifrost.h diff --git a/src/gallium/drivers/panfrost/bifrost/cmdline.c b/src/panfrost/bifrost/cmdline.c similarity index 100% rename from src/gallium/drivers/panfrost/bifrost/cmdline.c rename to src/panfrost/bifrost/cmdline.c diff --git a/src/gallium/drivers/panfrost/bifrost/disassemble.c b/src/panfrost/bifrost/disassemble.c similarity index 100% rename from src/gallium/drivers/panfrost/bifrost/disassemble.c rename to src/panfrost/bifrost/disassemble.c diff --git a/src/gallium/drivers/panfrost/bifrost/disassemble.h b/src/panfrost/bifrost/disassemble.h similarity index 100% rename from src/gallium/drivers/panfrost/bifrost/disassemble.h rename to src/panfrost/bifrost/disassemble.h diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build new file mode 100644 index 00000000000..1258cd04caf --- /dev/null +++ b/src/panfrost/bifrost/meson.build @@ -0,0 +1,33 @@ +# Copyright © 2018 Rob Clark +# Copyright © 2019 Collabora + +# 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. + +libpanfrost_bifrost_files = files( + 'disassemble.c', +) + +libpanfrost_bifrost = static_library( + 'panfrost_bifrost', + [libpanfrost_bifrost_files], + include_directories : [inc_common], + c_args : [c_vis_args, no_override_init_args], + cpp_args : [cpp_vis_args], + build_by_default : false, +) diff --git a/src/gallium/drivers/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h similarity index 100% rename from src/gallium/drivers/panfrost/include/panfrost-job.h rename to src/panfrost/include/panfrost-job.h diff --git a/src/gallium/drivers/panfrost/include/panfrost-misc.h b/src/panfrost/include/panfrost-misc.h similarity index 100% rename from src/gallium/drivers/panfrost/include/panfrost-misc.h rename to src/panfrost/include/panfrost-misc.h diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index 6b167d04b9c..9c12ff8fd8e 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -19,6 +19,64 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_panfrost = include_directories(['.', 'shared']) +inc_panfrost_hw = include_directories([ + 'include' +]) + +inc_panfrost = include_directories([ + '.', 'include', 'shared', 'midgard', 'bifrost' +]) subdir('shared') +subdir('midgard') +subdir('bifrost') +subdir('pandecode') + +files_pandecode = files( + 'pandecode/cmdline.c', + 'pandecode/common.c', + 'pandecode/decode.c', + 'pandecode/pan_pretty_print.c', + + 'midgard/disassemble.c', + 'midgard/midgard_ops.c', + 'bifrost/disassemble.c', +) + +pandecode = executable( + 'pandecoder', + files_pandecode, + include_directories : [inc_common, inc_include, inc_src, inc_panfrost], + dependencies : [ + dep_thread, + ], + link_with : [ + libmesa_util + ], + build_by_default : true +) + +files_bifrost = files( + 'bifrost/cmdline.c', +) + +bifrost_compiler = executable( + 'bifrost_compiler', + [files_bifrost], + include_directories : [ + inc_common, + inc_include, + inc_src, + inc_panfrost, + ], + dependencies : [ + dep_thread, + idep_nir + ], + link_with : [ + libglsl_standalone, + libmesa_util, + libpanfrost_bifrost + ], + build_by_default : true +) diff --git a/src/gallium/drivers/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/compiler.h rename to src/panfrost/midgard/compiler.h diff --git a/src/gallium/drivers/panfrost/midgard/cppwrap.cpp b/src/panfrost/midgard/cppwrap.cpp similarity index 100% rename from src/gallium/drivers/panfrost/midgard/cppwrap.cpp rename to src/panfrost/midgard/cppwrap.cpp diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/disassemble.c rename to src/panfrost/midgard/disassemble.c diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.h b/src/panfrost/midgard/disassemble.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/disassemble.h rename to src/panfrost/midgard/disassemble.h diff --git a/src/gallium/drivers/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/helpers.h rename to src/panfrost/midgard/helpers.h diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build new file mode 100644 index 00000000000..cbe26004e2d --- /dev/null +++ b/src/panfrost/midgard/meson.build @@ -0,0 +1,63 @@ +# Copyright © 2018 Rob Clark +# Copyright © 2019 Collabora + +# 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. + +libpanfrost_midgard_files = files( + 'midgard_compile.c', + 'mir.c', + 'midgard_print.c', + 'midgard_schedule.c', + 'midgard_emit.c', + 'midgard_ra.c', + 'midgard_ra_pipeline.c', + 'midgard_liveness.c', + 'midgard_ops.c', + 'cppwrap.cpp', + 'disassemble.c', +) + +midgard_nir_algebraic_c = custom_target( + 'midgard_nir_algebraic.c', + input : 'midgard_nir_algebraic.py', + output : 'midgard_nir_algebraic.c', + command : [ + prog_python, '@INPUT@', + '-p', join_paths(meson.source_root(), 'src/compiler/nir/'), + ], + capture : true, + depend_files : nir_algebraic_py, +) + +libpanfrost_midgard = static_library( + 'panfrost_midgard', + [libpanfrost_midgard_files, midgard_nir_algebraic_c], + include_directories : [ + inc_common, + inc_include, + inc_src, + inc_panfrost_hw, + ], + dependencies: [ + idep_nir + ], + c_args : [c_vis_args, no_override_init_args], + cpp_args : [cpp_vis_args], + build_by_default : false, +) diff --git a/src/gallium/drivers/panfrost/midgard/midgard-parse.h b/src/panfrost/midgard/midgard-parse.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard-parse.h rename to src/panfrost/midgard/midgard-parse.h diff --git a/src/gallium/drivers/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard.h rename to src/panfrost/midgard/midgard.h diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_compile.c rename to src/panfrost/midgard/midgard_compile.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.h b/src/panfrost/midgard/midgard_compile.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_compile.h rename to src/panfrost/midgard/midgard_compile.h diff --git a/src/gallium/drivers/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_emit.c rename to src/panfrost/midgard/midgard_emit.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_liveness.c b/src/panfrost/midgard/midgard_liveness.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_liveness.c rename to src/panfrost/midgard/midgard_liveness.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_nir.h b/src/panfrost/midgard/midgard_nir.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_nir.h rename to src/panfrost/midgard/midgard_nir.h diff --git a/src/gallium/drivers/panfrost/midgard/midgard_nir_algebraic.py b/src/panfrost/midgard/midgard_nir_algebraic.py similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_nir_algebraic.py rename to src/panfrost/midgard/midgard_nir_algebraic.py diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_ops.c rename to src/panfrost/midgard/midgard_ops.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ops.h b/src/panfrost/midgard/midgard_ops.h similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_ops.h rename to src/panfrost/midgard/midgard_ops.h diff --git a/src/gallium/drivers/panfrost/midgard/midgard_print.c b/src/panfrost/midgard/midgard_print.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_print.c rename to src/panfrost/midgard/midgard_print.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_ra.c rename to src/panfrost/midgard/midgard_ra.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ra_pipeline.c b/src/panfrost/midgard/midgard_ra_pipeline.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_ra_pipeline.c rename to src/panfrost/midgard/midgard_ra_pipeline.c diff --git a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/midgard_schedule.c rename to src/panfrost/midgard/midgard_schedule.c diff --git a/src/gallium/drivers/panfrost/midgard/mir.c b/src/panfrost/midgard/mir.c similarity index 100% rename from src/gallium/drivers/panfrost/midgard/mir.c rename to src/panfrost/midgard/mir.c diff --git a/src/gallium/drivers/panfrost/pandecode/cmdline.c b/src/panfrost/pandecode/cmdline.c similarity index 100% rename from src/gallium/drivers/panfrost/pandecode/cmdline.c rename to src/panfrost/pandecode/cmdline.c diff --git a/src/gallium/drivers/panfrost/pandecode/common.c b/src/panfrost/pandecode/common.c similarity index 100% rename from src/gallium/drivers/panfrost/pandecode/common.c rename to src/panfrost/pandecode/common.c diff --git a/src/gallium/drivers/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c similarity index 99% rename from src/gallium/drivers/panfrost/pandecode/decode.c rename to src/panfrost/pandecode/decode.c index 1326fd1a916..61b8914388e 100644 --- a/src/gallium/drivers/panfrost/pandecode/decode.c +++ b/src/panfrost/pandecode/decode.c @@ -32,9 +32,10 @@ #include "decode.h" #include "util/u_math.h" -#include "../pan_pretty_print.h" -#include "../midgard/disassemble.h" -#include "../bifrost/disassemble.h" +#include "pan_pretty_print.h" +#include "midgard/disassemble.h" +#include "bifrost/disassemble.h" + int pandecode_replay_jc(mali_ptr jc_gpu_va, bool bifrost); #define MEMORY_PROP(obj, p) {\ diff --git a/src/gallium/drivers/panfrost/pandecode/decode.h b/src/panfrost/pandecode/decode.h similarity index 100% rename from src/gallium/drivers/panfrost/pandecode/decode.h rename to src/panfrost/pandecode/decode.h diff --git a/src/panfrost/pandecode/meson.build b/src/panfrost/pandecode/meson.build new file mode 100644 index 00000000000..2c341a58cc4 --- /dev/null +++ b/src/panfrost/pandecode/meson.build @@ -0,0 +1,35 @@ +# Copyright © 2018 Rob Clark +# Copyright © 2019 Collabora + +# 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. + +libpanfrost_decode_files = files( + 'pan_pretty_print.c', + 'common.c', + 'decode.c', +) + +libpanfrost_decode = static_library( + 'panfrost_decode', + [libpanfrost_decode_files], + include_directories : [inc_common, inc_panfrost], + c_args : [c_vis_args, no_override_init_args], + cpp_args : [cpp_vis_args], + build_by_default : false, +) diff --git a/src/gallium/drivers/panfrost/pan_pretty_print.c b/src/panfrost/pandecode/pan_pretty_print.c similarity index 100% rename from src/gallium/drivers/panfrost/pan_pretty_print.c rename to src/panfrost/pandecode/pan_pretty_print.c diff --git a/src/gallium/drivers/panfrost/pan_pretty_print.h b/src/panfrost/pandecode/pan_pretty_print.h similarity index 100% rename from src/gallium/drivers/panfrost/pan_pretty_print.h rename to src/panfrost/pandecode/pan_pretty_print.h -- 2.30.2