diff options
| author | Jason Ekstrand <[email protected]> | 2017-02-28 09:10:43 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-13 11:16:34 +0000 |
| commit | 700bebb958e93f4d472c383de62ced9db8e64bec (patch) | |
| tree | 0075c098c56c338f38ba0db80b9dba3e7e268a17 /src/intel/tools | |
| parent | d0d4a5f43b4dd79bd7bfff7c7deaade10bfebf7c (diff) | |
i965: Move the back-end compiler to src/intel/compiler
Mostly a dummy git mv with a couple of noticable parts:
- With the earlier header cleanups, nothing in src/intel depends
files from src/mesa/drivers/dri/i965/
- Both Autoconf and Android builds are addressed. Thanks to Mauro and
Tapani for the fixups in the latter
- brw_util.[ch] is not really compiler specific, so it's moved to i965.
v2:
- move brw_eu_defines.h instead of brw_defines.h
- remove no-longer applicable includes
- add missing vulkan/ prefix in the Android build (thanks Tapani)
v3:
- don't list brw_defines.h in src/intel/Makefile.sources (Jason)
- rebase on top of the oa patches
[Emil Velikov: commit message, various small fixes througout]
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel/tools')
| -rw-r--r-- | src/intel/tools/Makefile.am | 4 | ||||
| -rw-r--r-- | src/intel/tools/disasm.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/intel/tools/Makefile.am b/src/intel/tools/Makefile.am index 5f4d78d6fdc..3ef4f31adef 100644 --- a/src/intel/tools/Makefile.am +++ b/src/intel/tools/Makefile.am @@ -29,8 +29,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/mesa/drivers/dri/i965 \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include \ -I$(top_builddir)/src/intel \ @@ -38,7 +36,7 @@ AM_CPPFLAGS = \ aubinator_DEPS = \ $(top_builddir)/src/intel/common/libintel_common.la \ - $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ + $(top_builddir)/src/intel/compiler/libintel_compiler.la \ $(top_builddir)/src/util/libmesautil.la \ $(PER_GEN_LIBS) \ $(PTHREAD_LIBS) \ diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c index 96c6ce290a0..62256d2b53e 100644 --- a/src/intel/tools/disasm.c +++ b/src/intel/tools/disasm.c @@ -23,8 +23,8 @@ #include <stdlib.h> -#include "brw_inst.h" -#include "brw_eu.h" +#include "compiler/brw_inst.h" +#include "compiler/brw_eu.h" #include "gen_disasm.h" |