From 700bebb958e93f4d472c383de62ced9db8e64bec Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 28 Feb 2017 09:10:43 -0800 Subject: 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 Reviewed-by: Jason Ekstrand --- src/intel/blorp/blorp.c | 4 ++-- src/intel/blorp/blorp_clear.c | 2 +- src/intel/blorp/blorp_priv.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/intel/blorp') diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index 08ce97d9e5d..0b2395d9f7a 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -26,8 +26,8 @@ #include "program/prog_instruction.h" #include "blorp_priv.h" -#include "brw_compiler.h" -#include "brw_nir.h" +#include "compiler/brw_compiler.h" +#include "compiler/brw_nir.h" void blorp_init(struct blorp_context *blorp, void *driver_ctx, diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 2c3b4e6bef6..627528defac 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -27,7 +27,7 @@ #include "util/format_rgb9e5.h" #include "blorp_priv.h" -#include "brw_eu_defines.h" +#include "compiler/brw_eu_defines.h" #include "compiler/nir/nir_builder.h" diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index d9c03b1c076..c61ab08746d 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -27,7 +27,7 @@ #include #include "compiler/nir/nir.h" -#include "brw_compiler.h" +#include "compiler/brw_compiler.h" #include "blorp.h" -- cgit v1.2.3