Mesa (master): i965/cnl: Wire up Mesa build files for gen10
Anuj Phogat
aphogat at kemper.freedesktop.org
Fri Jun 9 23:09:39 UTC 2017
Module: Mesa
Branch: master
Commit: e01c5a6824cdc8578acc6cebd2ac1baabccb5807
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e01c5a6824cdc8578acc6cebd2ac1baabccb5807
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Thu May 11 14:18:52 2017 -0700
i965/cnl: Wire up Mesa build files for gen10
V2: Remove isl_gen10.c and isl_gen10.h
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/intel/Makefile.isl.am | 4 ++++
src/intel/Makefile.sources | 10 ++++++++--
src/intel/Makefile.vulkan.am | 7 ++++++-
src/mesa/drivers/dri/i965/Makefile.am | 6 +++++-
src/mesa/drivers/dri/i965/Makefile.sources | 4 ++++
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am
index ee2215df1d..31273af36c 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 3136a1b250..a877ff273d 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 878abf3f7d..8fe857efe1 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)
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 762aefc554..c29cc594c8 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -53,7 +53,8 @@ I965_PERGEN_LIBS = \
libi965_gen7.la \
libi965_gen75.la \
libi965_gen8.la \
- libi965_gen9.la
+ libi965_gen9.la \
+ libi965_gen10.la
libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
@@ -79,6 +80,9 @@ libi965_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
libi965_gen9_la_SOURCES = $(i965_gen9_FILES)
libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
+libi965_gen10_la_SOURCES = $(i965_gen10_FILES)
+libi965_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
+
noinst_LTLIBRARIES = \
libi965_dri.la \
$(I965_PERGEN_LIBS)
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index f199235be6..1e656eb65a 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -155,6 +155,10 @@ i965_gen9_FILES = \
genX_blorp_exec.c \
genX_state_upload.c
+i965_gen10_FILES = \
+ genX_blorp_exec.c \
+ genX_state_upload.c
+
i965_oa_GENERATED_FILES = \
brw_oa_hsw.h \
brw_oa_hsw.c
More information about the mesa-commit
mailing list