diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-24 15:51:36 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-27 10:26:13 -0800 |
| commit | 452782f68b3e8d25538fbe65b942c0af7c3bb147 (patch) | |
| tree | a5296231e7c2b0db211f1a816e7bc75d1bccb426 /src | |
| parent | 265d4c415ca6b41bdd9a4a3e9f311d8f6e69cef1 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/genxml/genX_pack.h | 8 | ||||
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h index 69fc340762b..7967c292645 100644 --- 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 53cfa20a263..6be4f9fb427 100644 --- 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 |