summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/Android.mk
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-08-01 17:06:10 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-13 00:46:55 +0100
commitb3121bfd413973f460e2cc9a9f852bdfa1265fcf (patch)
tree9f08d6c5df15cfcd3629c6a83f1a8bc952ff1b7e /src/mesa/drivers/dri/i965/Android.mk
parent07f583186dd4c5a92f6382c4c232a6a96bd049a6 (diff)
downloadexternal_mesa3d-b3121bfd413973f460e2cc9a9f852bdfa1265fcf.zip
external_mesa3d-b3121bfd413973f460e2cc9a9f852bdfa1265fcf.tar.gz
external_mesa3d-b3121bfd413973f460e2cc9a9f852bdfa1265fcf.tar.bz2
mesa: guard better when building with sse4.1 optimisations
When the compiler is not capable/does not accept -msse4.1 while the target has the instruction set we'll blow up as _mesa_streaming_load_memcpy is going to be undefined. To make sure that never happens, wrap the runtime cpu check+caller in an ifdef thus do not compile that hunk of the code. Fix the android build by enabling the optimisation and adding the define where applicable. v2: autoconf conditionals end with "fi" rather than endif. v3: Wrap the definition and call to intel_miptree_{un,}map_movntdqa in if defined(USE_SSE41). Spotted by Matt. Cc: Matt Turner <mattst88@gmail.com> Cc: Adrian Negreanu <adrian.m.negreanu@intel.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/Android.mk')
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 7e3fd65..2c6446f 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -35,6 +35,11 @@ include $(LOCAL_PATH)/Makefile.sources
LOCAL_CFLAGS := \
$(MESA_DRI_CFLAGS)
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_CFLAGS += \
+ -DUSE_SSE41
+endif
+
LOCAL_C_INCLUDES := \
$(i965_INCLUDES) \
$(MESA_DRI_C_INCLUDES) \