freedreno/rnn: rework RNN_DEF_PATH construction

No need for rnn_path.h, just construct the whole thing in meson and pass
via c_args.  Also move where the path is constructed up one level.  This
will be needed for syncing back to envytools, where the path will be
different.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6154>
This commit is contained in:
Rob Clark
2020-08-02 10:16:47 -07:00
committed by Marge Bot
parent bf425b7e51
commit 24f55eb6e8
4 changed files with 5 additions and 6 deletions
+4
View File
@@ -21,6 +21,10 @@
inc_freedreno = include_directories(['.', './registers', './common'])
inc_freedreno_rnn = include_directories('rnn')
rnn_src_path = meson.source_root() + '/src/freedreno/registers'
rnn_install_path = get_option('datadir') + '/freedreno/registers'
rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path
subdir('common')
subdir('registers')
subdir('drm')
+1 -4
View File
@@ -27,7 +27,6 @@ libfreedreno_rnn_files = files(
'rnn.h',
'rnndec.c',
'rnndec.h',
'rnn_path.h',
'util.h',
)
@@ -40,9 +39,7 @@ libfreedreno_rnn = static_library(
],
c_args : [
no_override_init_args,
'-DSOURCE_DIR="' + meson.source_root() + '"',
# TODO how do we get install prefix??
'-DINSTALL_DIR=""',
'-DRNN_DEF_PATH="' + rnn_path + '"',
],
gnu_symbol_visibility: 'hidden',
dependencies: [ dep_libxml2 ],
-1
View File
@@ -39,7 +39,6 @@
#include <ctype.h>
#include <stdio.h>
#include "rnn.h"
#include "rnn_path.h"
#include "util.h"
#include "util/u_debug.h"
-1
View File
@@ -1 +0,0 @@
#define RNN_DEF_PATH SOURCE_DIR "/src/freedreno/registers:" INSTALL_DIR "share/mesa/freedreno/registers"