diff options
| author | Jordan Justen <[email protected]> | 2018-02-26 15:39:59 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2018-03-05 09:47:37 -0800 |
| commit | 272bef0601a1bdb5292771aefc8d62fcbdf4c47f (patch) | |
| tree | c94ae513a916ed81151067da24260bbb424e5deb /src/intel/tools | |
| parent | 9a0d7bb48c93e7d0109751469a8b32c94e85bc24 (diff) | |
intel: Split gen_device_info out into libintel_dev
Split out the device info so isl doesn't depend on intel/common. Now
it will depend on the new intel/dev device info lib.
This will allow the decoder in intel/common to use isl, allowing us to
apply Ken's patch that removes the genxml duplication of surface
formats.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Diffstat (limited to 'src/intel/tools')
| -rw-r--r-- | src/intel/tools/gen_disasm.h | 2 | ||||
| -rw-r--r-- | src/intel/tools/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/tools/gen_disasm.h b/src/intel/tools/gen_disasm.h index 52601cb2864..c8c18b2cf03 100644 --- a/src/intel/tools/gen_disasm.h +++ b/src/intel/tools/gen_disasm.h @@ -24,7 +24,7 @@ #ifndef GEN_DISASM_H #define GEN_DISASM_H -#include "intel/common/gen_device_info.h" +#include "intel/dev/gen_device_info.h" #ifdef __cplusplus extern "C" { diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index 82413041b13..84b44841f75 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -24,7 +24,7 @@ aubinator = executable( 'gen_disasm.h', 'intel_aub.h'), dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libmesa_util], + link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], c_args : [c_vis_args, no_override_init_args], build_by_default : with_tools.contains('intel'), install : with_tools.contains('intel'), @@ -36,7 +36,7 @@ aubinator_error_decode = executable( 'gen_batch_decoder.c'), dependencies : [dep_zlib, dep_thread], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libmesa_util], + link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], c_args : [c_vis_args, no_override_init_args], build_by_default : with_tools.contains('intel'), install : with_tools.contains('intel'), |