OSDN Git Service

android: i965: add per-gen libmesa_i965_gen{7,75} static libraries
authorMauro Rossi <issor.oruam@gmail.com>
Fri, 19 Aug 2016 21:55:54 +0000 (23:55 +0200)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 20 Aug 2016 23:18:28 +0000 (16:18 -0700)
Needed to fix android build after commit e198983
which enabled genxml for gen{7,75} state setup

Android build fix for gen{8,9} will follow as incremental patch,
build tested successfully with all per-gen patches applied.

src/mesa/drivers/dri/i965/Android.mk

index 4afbd66..d4c4628 100644 (file)
@@ -40,7 +40,9 @@ I965_PERGEN_STATIC_LIBRARIES := \
        libmesa_nir
 
 I965_PERGEN_LIBS := \
-       libmesa_i965_gen6
+       libmesa_i965_gen6 \
+       libmesa_i965_gen7 \
+       libmesa_i965_gen75
 
 # ---------------------------------------
 # Build libmesa_i965_gen6
@@ -64,6 +66,48 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 # ---------------------------------------
+# Build libmesa_i965_gen7
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen7
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen7_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=70
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
+# Build libmesa_i965_gen75
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_i965_gen75
+
+LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
+
+LOCAL_SRC_FILES := $(i965_gen75_FILES)
+
+LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
+
+LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
+
+LOCAL_CFLAGS := -DGEN_VERSIONx10=75
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
 # Build i965_dri
 # ---------------------------------------