diff options
| author | Anuj Phogat <[email protected]> | 2017-05-11 14:18:52 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2017-06-09 16:02:58 -0700 |
| commit | e01c5a6824cdc8578acc6cebd2ac1baabccb5807 (patch) | |
| tree | 93411ae8f8386904003358fc95052241c86488cd /src/intel | |
| parent | 2417d5ca19e473de33fbc05173b86dc64b94c5f9 (diff) | |
i965/cnl: Wire up Mesa build files for gen10
V2: Remove isl_gen10.c and isl_gen10.h
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/Makefile.isl.am | 4 | ||||
| -rw-r--r-- | src/intel/Makefile.sources | 10 | ||||
| -rw-r--r-- | src/intel/Makefile.vulkan.am | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am index ee2215df1d1..31273af36c0 100644 --- a/src/intel/Makefile.isl.am +++ b/src/intel/Makefile.isl.am @@ -27,6 +27,7 @@ ISL_GEN_LIBS = \ isl/libisl-gen75.la \ isl/libisl-gen8.la \ isl/libisl-gen9.la \ + isl/libisl-gen10.la \ $(NULL) noinst_LTLIBRARIES += $(ISL_GEN_LIBS) isl/libisl.la @@ -55,6 +56,9 @@ isl_libisl_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80 isl_libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES) isl_libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 +isl_libisl_gen10_la_SOURCES = $(ISL_GEN10_FILES) +isl_libisl_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100 + BUILT_SOURCES += $(ISL_GENERATED_FILES) isl/isl_format_layout.c: isl/gen_format_layout.py \ diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 3136a1b250d..a877ff273dc 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -125,7 +125,8 @@ GENXML_XML_FILES = \ genxml/gen7.xml \ genxml/gen75.xml \ genxml/gen8.xml \ - genxml/gen9.xml + genxml/gen9.xml \ + genxml/gen10.xml GENXML_GENERATED_PACK_FILES = \ genxml/gen4_pack.h \ @@ -135,7 +136,8 @@ GENXML_GENERATED_PACK_FILES = \ genxml/gen7_pack.h \ genxml/gen75_pack.h \ genxml/gen8_pack.h \ - genxml/gen9_pack.h + genxml/gen9_pack.h \ + genxml/gen10_pack.h GENXML_GENERATED_FILES = \ $(GENXML_GENERATED_PACK_FILES) \ @@ -187,6 +189,10 @@ ISL_GEN9_FILES = \ isl/isl_emit_depth_stencil.c \ isl/isl_surface_state.c +ISL_GEN10_FILES = \ + isl/isl_emit_depth_stencil.c \ + isl/isl_surface_state.c + ISL_GENERATED_FILES = \ isl/isl_format_layout.c diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am index 878abf3f7d3..8fe857efe14 100644 --- a/src/intel/Makefile.vulkan.am +++ b/src/intel/Makefile.vulkan.am @@ -72,7 +72,8 @@ VULKAN_PER_GEN_LIBS = \ vulkan/libanv-gen7.la \ vulkan/libanv-gen75.la \ vulkan/libanv-gen8.la \ - vulkan/libanv-gen9.la + vulkan/libanv-gen9.la \ + vulkan/libanv-gen10.la noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS) @@ -107,6 +108,10 @@ vulkan_libanv_gen9_la_CFLAGS = $(VULKAN_CFLAGS) vulkan_libanv_gen9_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=90 vulkan_libanv_gen9_la_SOURCES = $(VULKAN_GEN9_FILES) +vulkan_libanv_gen10_la_CFLAGS = $(VULKAN_CFLAGS) +vulkan_libanv_gen10_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=100 +vulkan_libanv_gen10_la_SOURCES = $(VULKAN_GEN10_FILES) + VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) |