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/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/intel/Makefile.am') diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am index 9186b5cf1bd..8d852a09c98 100644 --- a/src/intel/Makefile.am +++ b/src/intel/Makefile.am @@ -26,12 +26,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src/compiler/glsl \ + -I$(top_srcdir)/src/compiler/glsl \ -I$(top_builddir)/src/compiler/nir \ + -I$(top_srcdir)/src/compiler/nir \ + -I$(top_srcdir)/src/gtest/include \ -I$(top_builddir)/src/intel \ -I$(top_srcdir)/src/intel \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mesa/drivers/dri/i965 \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include \ $(INTEL_CFLAGS) \ @@ -54,6 +57,7 @@ EXTRA_DIST = include Makefile.blorp.am include Makefile.common.am +include Makefile.compiler.am include Makefile.genxml.am include Makefile.isl.am -- cgit v1.2.3