android: add support for egl_dri2

Add rules to build egl_dri2 and make it a built-in EGL driver of
libGLES_mesa.

Reviewed-by: Chad Versace <chad@chad-versace.us>

diff --git a/Android.mk b/Android.mk
index ed68aec65ca1a6d3048759c9a96df98ea6472ba4..bc4b74e30aba14af5c72cfc138c88b2ffd792e1a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,8 @@
 #   classic drivers:
 #   gallium drivers: swrast i915g nouveau r300g r600g vmwgfx
 #
-# The main target is libGLES_mesa.  There is no classic drivers yet.
+# The main target is libGLES_mesa.  For each classic driver enabled, a DRI
+# module will also be built.  DRI modules will be loaded by libGLES_mesa.
 
 MESA_TOP := $(call my-dir)
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
@@ -76,6 +77,10 @@ SUBDIRS := \
        src/mesa \
        src/egl/main
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+SUBDIRS += src/egl/drivers/dri2
+endif
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 SUBDIRS += src/gallium
 endif
@@ -107,6 +112,10 @@ ifneq ($(MESA_GPU_DRIVERS),swrast)
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+LOCAL_STATIC_LIBRARIES += libmesa_egl_dri2
+endif
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 
 gallium_DRIVERS :=

diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk
new file mode 100644 (file)
index 0000000..5c506f8
--- /dev/null
+++ b/src/egl/drivers/dri2/Android.mk
@@ -0,0 +1,50 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for egl_dri2
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+       egl_dri2.c \
+       platform_android.c
+
+LOCAL_CFLAGS := \
+       -D_EGL_MAIN=_eglBuiltInDriverDRI2 \
+       -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" \
+       -DHAVE_SHARED_GLAPI \
+       -DHAVE_ANDROID_PLATFORM
+
+LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/egl/main \
+       $(DRM_GRALLOC_TOP) \
+       $(DRM_TOP) \
+       $(DRM_TOP)/include/drm
+
+LOCAL_MODULE := libmesa_egl_dri2
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index 25a7c6576760fb067e4a4d2b50ccefea60bd93ab..a2933d7abfd6aa5d5e4e45dd45ea26efe8e17dda 100644 (file)
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -54,6 +54,9 @@ LOCAL_CFLAGS := \
        -D_EGL_DRIVER_SEARCH_DIR=\"/system/lib/egl\" \
        -D_EGL_OS_UNIX=1
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
+endif
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GALLIUM
 endif