summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2010-10-26 15:28:28 -0400
committerChih-Wei Huang <cwhuang@linux.org.tw>2010-12-29 16:56:47 +0800
commitd1ccafa5b7a79366a8439c2e39e8bf8fe7bdacb6 (patch)
treecee2d834643a45cb67b3d00fe74ea572041b7fc7
parentf7a0636329f2ea7f3fe618849de8e154732c2a1c (diff)
android: Enable OpenGL ES 2.0.
-rw-r--r--src/mapi/Android.mk8
-rw-r--r--src/mesa/drivers/Android.mk1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index c473716543..7a61d1571a 100644
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -16,6 +16,14 @@ glapi_C_INCLUDES := \
external/mesa/include \
external/mesa/src/mapi
+# use x86 assembly to generate ES2 entries on the fly
+glapi_SOURCES += \
+ $(addprefix es1api/glapi/, $(X86_API))
+glapi_CFLAGS += \
+ -DUSE_X86_ASM
+glapi_C_INCLUDES += \
+ external/mesa/src/mesa
+
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glapi
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index 28f5beb5f7..00de3c1a82 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -167,6 +167,7 @@ common_CFLAGS := \
-DPTHREADS \
-DFEATURE_GL=1 \
-DFEATURE_ES1=1 \
+ -DFEATURE_ES2=1 \
-fvisibility=hidden \
-Wno-sign-compare