anv/icl: Build anv libs for gen11

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 32b4892e174f54066eae5bf5ae79aaf59fb0b98c..6fe736d39786d3c34adc8650ceebd839dcb3e294 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -184,6 +184,26 @@ LOCAL_SHARED_LIBRARIES := libdrm
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+#
+# libanv for gen11
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmesa_anv_gen11
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
+LOCAL_CFLAGS := -DGEN_VERSIONx10=110
+
+LOCAL_C_INCLUDES := $(ANV_INCLUDES)
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
+
+LOCAL_SHARED_LIBRARIES := libdrm
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 #
 # libmesa_vulkan_common
 #
@@ -270,6 +290,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_anv_gen8 \
        libmesa_anv_gen9 \
        libmesa_anv_gen10 \
+       libmesa_anv_gen11 \
        libmesa_intel_compiler \
        libmesa_anv_entrypoints
 

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 22563cac6ac5e99dbe128b1bb6ee6507509daeaf..692c86047704e6095375a04daa51e35c483a04b4 100644 (file)
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -285,3 +285,7 @@ VULKAN_GEN9_FILES := \
 VULKAN_GEN10_FILES := \
        vulkan/gen8_cmd_buffer.c \
        $(VULKAN_GENX_FILES)
+
+VULKAN_GEN11_FILES := \
+       vulkan/gen8_cmd_buffer.c \
+       $(VULKAN_GENX_FILES)

diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 23fa877e77d144b1f7ab1ca8ac2ed371fa5a34a8..891ee698a0261431aa7a5af73a12ea30872a455a 100644 (file)
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -98,7 +98,8 @@ VULKAN_PER_GEN_LIBS = \
        vulkan/libanv-gen75.la \
        vulkan/libanv-gen8.la \
        vulkan/libanv-gen9.la \
-       vulkan/libanv-gen10.la
+       vulkan/libanv-gen10.la \
+       vulkan/libanv-gen11.la
 
 noinst_LTLIBRARIES += $(VULKAN_PER_GEN_LIBS)
 
@@ -138,6 +139,10 @@ 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_libanv_gen11_la_CFLAGS = $(VULKAN_CFLAGS)
+vulkan_libanv_gen11_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=110
+vulkan_libanv_gen11_la_SOURCES = $(VULKAN_GEN11_FILES)
+
 VULKAN_SOURCES = \
        $(VULKAN_GENERATED_FILES) \
        $(VULKAN_FILES)

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 41dba420cb4ed5e997fdc482931d214739e6b778..f031723670229678435d59f59350646b2c6d82fe 100644 (file)
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -101,7 +101,7 @@ anv_gen_files = files(
 )
 foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
              ['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
-             ['100', ['gen8_cmd_buffer.c']]]
+             ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']]]
   _gen = g[0]
   libanv_gen_libs += static_library(
     'libanv_gen@0@'.format(_gen),