OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: mesa: Revert "android: mesa: revert "Enable asm unconditionally""

Browse Source 
Commit 45206d7673 fixed PIC issue of x86 asm stub.
We can enable asm for Android x86 now. This should sightly improve performance.

Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Signed-off-by: Lepton Wu <lepton@chromium.org>
This commit is contained in:
Lepton Wu
2019-10-29 17:41:14 -07:00
parent 6914b0236f
commit 5c2d307a10
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.common.mk
View File

@@ -103,12 +103,9 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
LOCAL_CFLAGS += -DHAVE_SYS_SHM_H LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
endif endif
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-DUSE_X86_ASM -DUSE_X86_ASM
endif
endif endif
ifeq ($(ARCH_ARM_HAVE_NEON),true) ifeq ($(ARCH_ARM_HAVE_NEON),true)
LOCAL_CFLAGS_arm += -DUSE_ARM_ASM LOCAL_CFLAGS_arm += -DUSE_ARM_ASM

7
Android.mk
View File

@@ -84,13 +84,6 @@ endif
$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true)) $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
# host and target must be the same arch to generate matypes.h
ifeq ($(TARGET_ARCH),$(HOST_ARCH))
MESA_ENABLE_ASM := true
else
MESA_ENABLE_ASM := false
endif
ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),) ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
MESA_ENABLE_LLVM := true MESA_ENABLE_LLVM := true
endif endif

2
src/mesa/Android.libmesa_dricore.mk
View File

@@ -39,11 +39,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(MESA_FILES) $(MESA_FILES)
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES) LOCAL_SRC_FILES += $(X86_FILES)
endif # x86 endif # x86
endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true) ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := \

2
src/mesa/Android.libmesa_st_mesa.mk
View File

@@ -42,11 +42,9 @@ LOCAL_GENERATED_SOURCES := \
$(MESA_GEN_GLSL_H) \ $(MESA_GEN_GLSL_H) \
$(MESA_GEN_NIR_H) $(MESA_GEN_NIR_H)
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES) LOCAL_SRC_FILES += $(X86_FILES)
endif # x86 endif # x86
endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true) ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := \