android: enable x86 asm and sse4 for x86 and x86_64

[android-x86/external-mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index ed5118a..ef83a97 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -43,6 +43,8 @@ LOCAL_CFLAGS += \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
+       -DENABLE_SHADER_CACHE \
+       -D__STDC_CONSTANT_MACROS \
        -D__STDC_LIMIT_MACROS \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
@@ -51,7 +53,7 @@ LOCAL_CFLAGS += \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
-       _DHAVE_FUNC_ATTRIBUTE_ALIAS \
+       -DHAVE_FUNC_ATTRIBUTE_ALIAS \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -60,6 +62,7 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
+       -DTEXTURE_FLOAT_ENABLED \
        -fvisibility=hidden \
        -Wno-sign-compare
 
@@ -67,20 +70,47 @@ LOCAL_CFLAGS += \
 LOCAL_CONLYFLAGS += \
        -std=c99
 
+x86_flags := \
+       -DUSE_SSE41 \
+
+x86_64_flags := \
+       -DUSE_SSE41 \
+
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS += \
+x86_flags += \
        -DUSE_X86_ASM \
+       -DUSE_MMX_ASM \
+       -DUSE_3DNOW_ASM \
+       -DUSE_SSE_ASM \
+
+x86_64_flags += \
+       -DUSE_X86_64_ASM \
 
-endif
 endif
 
+LOCAL_ASFLAGS_x86 += $(x86_flags)
+LOCAL_ASFLAGS_x86_64 += $(x86_64_flags)
+LOCAL_CFLAGS_x86 += $(x86_flags)
+LOCAL_CFLAGS_x86_64 += $(x86_64_flags)
+
 ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_CFLAGS += \
-       -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
        -D__STDC_CONSTANT_MACROS \
        -D__STDC_FORMAT_MACROS \
        -D__STDC_LIMIT_MACROS
+
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),5)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
+    ELF_INCLUDES := external/elfutils/0.153/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/src/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/libelf
+  endif
 endif
 
 ifneq ($(LOCAL_IS_HOST_MODULE),true)
@@ -92,7 +122,7 @@ endif
 endif
 
 LOCAL_CPPFLAGS += \
-       $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
+       $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-std=c++11) \
        -Wno-error=non-virtual-dtor \
        -Wno-non-virtual-dtor