panfrost: Move pandecode into lib/
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6196>
This commit is contained in:
parent
1c62b5528a
commit
d62a6e7c5f
|
@ -27,7 +27,7 @@
|
|||
#include "bit.h"
|
||||
#include "panfrost/lib/decode.h"
|
||||
#include "drm-uapi/panfrost_drm.h"
|
||||
#include "panfrost/encoder/pan_encoder.h"
|
||||
#include "panfrost/lib/pan_encoder.h"
|
||||
|
||||
/* Standalone compiler tests submitting jobs directly to the hardware. Uses the
|
||||
* `bit` prefix for `BIfrost Tests` and because bit sounds wicked cool. */
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
#define __BIFROST_TEST_H
|
||||
|
||||
#include "panfrost/include/panfrost-job.h"
|
||||
#include "panfrost/encoder/pan_device.h"
|
||||
#include "panfrost/encoder/pan_bo.h"
|
||||
#include "panfrost/lib/pan_device.h"
|
||||
#include "panfrost/lib/pan_bo.h"
|
||||
#include "bifrost_compile.h"
|
||||
#include "bifrost/compiler.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef __PAN_DECODE_H__
|
||||
#define __PAN_DECODE_H__
|
||||
|
||||
#include "public.h"
|
||||
#include "wrap.h"
|
||||
#include "util/list.h"
|
||||
|
||||
extern FILE *pandecode_dump_stream;
|
|
@ -37,6 +37,11 @@ libpanfrost_lib_files = files(
|
|||
'pan_props.c',
|
||||
)
|
||||
|
||||
libpanfrost_decode_files = files(
|
||||
'decode_common.c',
|
||||
'decode.c',
|
||||
)
|
||||
|
||||
libpanfrost_lib = static_library(
|
||||
'panfrost_lib',
|
||||
[libpanfrost_lib_files],
|
||||
|
@ -46,3 +51,12 @@ libpanfrost_lib = static_library(
|
|||
dependencies: [dep_libdrm, idep_nir],
|
||||
build_by_default : false,
|
||||
)
|
||||
|
||||
libpanfrost_decode = static_library(
|
||||
'panfrost_decode',
|
||||
[libpanfrost_decode_files],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
|
||||
c_args : [no_override_init_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
build_by_default : false,
|
||||
)
|
||||
|
|
|
@ -31,7 +31,6 @@ subdir('shared')
|
|||
subdir('util')
|
||||
subdir('midgard')
|
||||
subdir('bifrost')
|
||||
subdir('pandecode')
|
||||
subdir('lib')
|
||||
|
||||
files_bifrost = files(
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
# 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(
|
||||
'common.c',
|
||||
'decode.c',
|
||||
)
|
||||
|
||||
libpanfrost_decode = static_library(
|
||||
'panfrost_decode',
|
||||
[libpanfrost_decode_files],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
|
||||
c_args : [no_override_init_args],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
build_by_default : false,
|
||||
)
|
Loading…
Reference in New Issue