i965/icl: Build and use gen11 functions for genxml state-upload and blorp

[mesa.git] / src / mesa / drivers / dri / i965 / Android.mk

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 7ee9ab784c33836205b72996af281694fad7e8af..83959cbf6cd2bf6f4963a4f39bb98acc7d47576b 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -29,11 +29,11 @@ include $(LOCAL_PATH)/Makefile.sources
 
 I965_PERGEN_COMMON_INCLUDES := \
        $(MESA_DRI_C_INCLUDES) \
-       $(MESA_TOP)/src/intel
+       $(MESA_TOP)/src/intel \
+       $(MESA_TOP)/include/drm-uapi
 
 I965_PERGEN_SHARED_LIBRARIES := \
-       $(MESA_DRI_SHARED_LIBRARIES) \
-       libdrm_intel
+       $(MESA_DRI_SHARED_LIBRARIES)
 
 I965_PERGEN_STATIC_LIBRARIES := \
        libmesa_genxml \
@@ -48,7 +48,8 @@ I965_PERGEN_LIBS := \
        libmesa_i965_gen75 \
        libmesa_i965_gen8 \
        libmesa_i965_gen9 \
-       libmesa_i965_gen10
+       libmesa_i965_gen10 \
+       libmesa_i965_gen11
 
 # ---------------------------------------
 # Build libmesa_i965_gen4
@@ -239,6 +240,27 @@ LOCAL_CFLAGS := -DGEN_VERSIONx10=100
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
+# ---------------------------------------
+# Build libmesa_i965_gen11
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen11
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen11_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=110
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
 # ---------------------------------------
 # Build i965_dri
 # ---------------------------------------
@@ -247,6 +269,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := i965_dri
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 LOCAL_CFLAGS := \
        $(MESA_DRI_CFLAGS)
@@ -257,7 +280,8 @@ LOCAL_CFLAGS += \
 endif
 
 LOCAL_C_INCLUDES := \
-       $(MESA_DRI_C_INCLUDES)
+       $(MESA_DRI_C_INCLUDES) \
+       $(MESA_TOP)/include/drm-uapi
 
 LOCAL_SRC_FILES := \
        $(i965_FILES)
@@ -271,8 +295,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_intel_compiler
 
 LOCAL_SHARED_LIBRARIES := \
-       $(MESA_DRI_SHARED_LIBRARIES) \
-       libdrm_intel
+       $(MESA_DRI_SHARED_LIBRARIES)
 
 LOCAL_GENERATED_SOURCES := \
        $(MESA_DRI_OPTIONS_H) \