gen/genX_pack: Add genxml to the pack header path

If you have an out-of-tree build, gen8_pack.h and friends will not be in
the same folder as genX_pack.h so this will be a problem.  We fixed
out-of-tree earlier by adding the genxml folder to the includes for the
vulkan driver.  However, this is not a good long-term solution because we
want to use it in ISL as well.

diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h
index 69fc340762b7e8416e0d0a46503d2c30aec957ae..7967c2926455e0a9d0d0f4b80a00f60c569b8ca9 100644 (file)
--- a/src/intel/genxml/genX_pack.h
+++ b/src/intel/genxml/genX_pack.h
@@ -28,13 +28,13 @@
 #endif
 
 #if (GEN_VERSIONx10 == 70)
-#  include "gen7_pack.h"
+#  include "genxml/gen7_pack.h"
 #elif (GEN_VERSIONx10 == 75)
-#  include "gen75_pack.h"
+#  include "genxml/gen75_pack.h"
 #elif (GEN_VERSIONx10 == 80)
-#  include "gen8_pack.h"
+#  include "genxml/gen8_pack.h"
 #elif (GEN_VERSIONx10 == 90)
-#  include "gen9_pack.h"
+#  include "genxml/gen9_pack.h"
 #else
 #  error "Need to add a pack header include for this gen"
 #endif

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 53cfa20a263d3499fe99490aef8ad20d9ebbea1b..6be4f9fb4270a458d00b0b5212f651390fac7173 100644 (file)
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -66,7 +66,6 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/src/compiler \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_builddir)/src/intel \
-       -I$(top_builddir)/src/intel/genxml \
        -I$(top_builddir)/src/vulkan
 
 libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init