summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorLepton Wu <[email protected]>2019-10-29 17:41:14 -0700
committerLepton Wu <[email protected]>2019-11-12 18:09:43 +0000
commit5c2d307a102be0c13d8f0ac483583e5daee6cfad (patch)
treece8a559fb185f2cd2c7fcc12f8fc0a1b7f4069f2 /src/mesa
parent6914b0236f648fa8787dd35a2d4dc0be6d0e03f9 (diff)
android: mesa: Revert "android: mesa: revert "Enable asm unconditionally""
Commit 45206d7673adb1484cbdb3eadaf82e0849c9cdcf fixed PIC issue of x86 asm stub. We can enable asm for Android x86 now. This should sightly improve performance. Acked-by: Eric Anholt <[email protected]> Acked-by: Eric Engestrom <[email protected]> Acked-by: Tapani Pälli <[email protected]> Signed-off-by: Lepton Wu <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Android.libmesa_dricore.mk2
-rw-r--r--src/mesa/Android.libmesa_st_mesa.mk2
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 792117767b4..8eb6aabe836 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -39,11 +39,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := \
$(MESA_FILES)
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
-endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index ddfd03059c5..16153a3c5bd 100644
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -42,11 +42,9 @@ LOCAL_GENERATED_SOURCES := \
$(MESA_GEN_GLSL_H) \
$(MESA_GEN_NIR_H)
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
-endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \