OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gen/genX_pack: Add genxml to the pack header path

Browse Source 
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.
This commit is contained in:
Jason Ekstrand
2016-02-24 15:51:36 -08:00
parent 265d4c415c
commit 452782f68b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/genxml/genX_pack.h
View File

@@ -28,13 +28,13 @@
#endif #endif
#if (GEN_VERSIONx10 == 70) #if (GEN_VERSIONx10 == 70)
# include "gen7_pack.h" # include "genxml/gen7_pack.h"
#elif (GEN_VERSIONx10 == 75) #elif (GEN_VERSIONx10 == 75)
# include "gen75_pack.h" # include "genxml/gen75_pack.h"
#elif (GEN_VERSIONx10 == 80) #elif (GEN_VERSIONx10 == 80)
# include "gen8_pack.h" # include "genxml/gen8_pack.h"
#elif (GEN_VERSIONx10 == 90) #elif (GEN_VERSIONx10 == 90)
# include "gen9_pack.h" # include "genxml/gen9_pack.h"
#else #else
# error "Need to add a pack header include for this gen" # error "Need to add a pack header include for this gen"
#endif #endif

1
src/intel/vulkan/Makefile.am
View File

@@ -66,7 +66,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/compiler \ -I$(top_builddir)/src/compiler \
-I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/compiler/nir \
-I$(top_builddir)/src/intel \ -I$(top_builddir)/src/intel \
-I$(top_builddir)/src/intel/genxml \
-I$(top_builddir)/src/vulkan -I$(top_builddir)/src/vulkan
libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init