android: add support for i915 and i965android-gingerbread-upstream-wip

This adds build rules for i915_dri and i965_dri to Android.  Only simple
tests work.  Due to missing functions in the drivers and egl_dri2 (such
as the lack of HAL_PIXEL_FORMAT_RGBA_8888 support), this is not enough
to drive SurfaceFligner.

3 files changed, 329 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index 29e033d01f..6f5b9e719a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
-#   classic drivers: TODO
+#   classic drivers: i915, i965
 #   gallium drivers: i915g, r300g, r600g, nouveau, vmwgfx
 #
 # The main target is libGLES_mesa.  Classic drivers depend on
@@ -44,6 +44,13 @@
 #   libmesa_gallium
 #
 # The rules can be found in src/gallium/targets/Android.mk.
+#
+# For each classic driver enabled, a DRI module will be built.  It consits of
+#
+#   libmesa_dricore
+#   libmesa_glsl
+#   libmesa_glsl_utils
+#   <driver-specific objects>
 
 LOCAL_PATH := $(call my-dir)
 
@@ -62,7 +69,7 @@ SUBDIRS := \
 
 MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
 
-classic_drivers :=
+classic_drivers := i915 i965
 gallium_drivers := i915g r300g r600g nouveau vmwgfx
 
 # warn about invalid drivers
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index ef276aa77f..c41b4d4882 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -26,6 +26,11 @@
 
 LOCAL_PATH := $(call my-dir)
 
+SUBDIRS :=
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+SUBDIRS += $(LOCAL_PATH)/drivers/Android.mk
+endif
+
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
@@ -58,6 +63,24 @@ include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif # MESA_BUILD_GALLIUM
 
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(MESA_SOURCES) \
+	$(MESA_CXX_SOURCES) \
+	$(X86_SOURCES)
+
+LOCAL_CFLAGS := $(common_CFLAGS) -DFEATURE_GL=1
+LOCAL_C_INCLUDES := $(common_C_INCLUDES)
+
+LOCAL_MODULE := libmesa_dricore
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+endif # MESA_BUILD_CLASSIC
+
 # avoid circular dependency between mesa core and glsl
 include $(CLEAR_VARS)
 
@@ -81,3 +104,5 @@ LOCAL_MODULE := libmesa_glsl_utils
 
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+-include $(SUBDIRS)
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
new file mode 100644
index 0000000000..39de3518c6
--- /dev/null
+++ b/src/mesa/drivers/Android.mk
@@ -0,0 +1,295 @@
+# Mesa 3-D graphics library
+# Version:  7.11
+#
+# 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 DRI drivers
+
+LOCAL_PATH := $(call my-dir)
+
+# from dri/i915/Makefile
+i915_DRIVER_SOURCES = \
+	i830_context.c \
+	i830_state.c \
+	i830_texblend.c \
+	i830_texstate.c \
+	i830_vtbl.c \
+	intel_render.c \
+	intel_regions.c \
+	intel_buffer_objects.c \
+	intel_batchbuffer.c \
+	intel_clear.c \
+	intel_extensions.c \
+	intel_extensions_es2.c \
+	intel_mipmap_tree.c \
+	intel_tex_layout.c \
+	intel_tex_image.c \
+	intel_tex_subimage.c \
+	intel_tex_copy.c \
+	intel_tex_validate.c \
+	intel_tex_format.c \
+	intel_tex.c \
+	intel_pixel.c \
+	intel_pixel_bitmap.c \
+	intel_pixel_copy.c \
+	intel_pixel_draw.c \
+	intel_pixel_read.c \
+	intel_buffers.c \
+	intel_blit.c \
+	i915_tex_layout.c \
+	i915_texstate.c \
+	i915_context.c \
+	i915_debug.c \
+	i915_debug_fp.c \
+	i915_fragprog.c \
+	i915_program.c \
+	i915_state.c \
+	i915_vtbl.c \
+	intel_context.c \
+	intel_decode.c \
+	intel_screen.c \
+	intel_span.c \
+	intel_state.c \
+	intel_syncobj.c \
+	intel_tris.c \
+	intel_fbo.c
+i915_DRIVER_SOURCES := $(addprefix dri/i915/, $(i915_DRIVER_SOURCES))
+
+# from dri/i965/Makefile
+i965_DRIVER_SOURCES = \
+	intel_batchbuffer.c \
+	intel_blit.c \
+	intel_buffer_objects.c \
+	intel_buffers.c \
+	intel_clear.c \
+	intel_context.c \
+	intel_decode.c \
+	intel_extensions.c \
+	intel_extensions_es2.c \
+	intel_fbo.c \
+	intel_mipmap_tree.c \
+	intel_regions.c \
+	intel_screen.c \
+	intel_span.c \
+	intel_pixel.c \
+	intel_pixel_bitmap.c \
+	intel_pixel_copy.c \
+	intel_pixel_draw.c \
+	intel_pixel_read.c \
+	intel_state.c \
+	intel_syncobj.c \
+	intel_tex.c \
+	intel_tex_copy.c \
+	intel_tex_format.c \
+	intel_tex_image.c \
+	intel_tex_layout.c \
+	intel_tex_subimage.c \
+	intel_tex_validate.c \
+	brw_cc.c \
+	brw_clip.c \
+	brw_clip_line.c \
+	brw_clip_point.c \
+	brw_clip_state.c \
+	brw_clip_tri.c \
+	brw_clip_unfilled.c \
+	brw_clip_util.c \
+	brw_context.c \
+	brw_curbe.c \
+	brw_disasm.c \
+	brw_draw.c \
+	brw_draw_upload.c \
+	brw_eu.c \
+	brw_eu_debug.c \
+	brw_eu_emit.c \
+	brw_eu_util.c \
+	brw_fallback.c \
+	brw_gs.c \
+	brw_gs_emit.c \
+	brw_gs_state.c \
+	brw_misc_state.c \
+	brw_optimize.c \
+	brw_program.c \
+	brw_queryobj.c \
+	brw_sf.c \
+	brw_sf_emit.c \
+	brw_sf_state.c \
+	brw_state_batch.c \
+	brw_state_cache.c \
+	brw_state_dump.c \
+	brw_state_upload.c \
+	brw_tex.c \
+	brw_tex_layout.c \
+	brw_urb.c \
+	brw_util.c \
+	brw_vs.c \
+	brw_vs_constval.c \
+	brw_vs_emit.c \
+	brw_vs_state.c \
+	brw_vs_surface_state.c \
+	brw_vtbl.c \
+	brw_wm.c \
+	brw_wm_debug.c \
+	brw_wm_emit.c \
+	brw_wm_fp.c \
+	brw_wm_iz.c \
+	brw_wm_pass0.c \
+	brw_wm_pass1.c \
+	brw_wm_pass2.c \
+	brw_wm_sampler_state.c \
+	brw_wm_state.c \
+	brw_wm_surface_state.c \
+	gen6_cc.c \
+	gen6_clip_state.c \
+	gen6_depthstencil.c \
+	gen6_gs_state.c \
+	gen6_sampler_state.c \
+	gen6_scissor_state.c \
+	gen6_sf_state.c \
+	gen6_urb.c \
+	gen6_viewport_state.c \
+	gen6_vs_state.c \
+	gen6_wm_state.c \
+	gen7_cc_state.c \
+	gen7_clip_state.c \
+	gen7_disable.c \
+	gen7_misc_state.c \
+	gen7_sampler_state.c \
+	gen7_sf_state.c \
+	gen7_urb.c \
+	gen7_viewport_state.c \
+	gen7_vs_state.c \
+	gen7_wm_state.c \
+	gen7_wm_surface_state.c
+i965_CXX_SOURCES = \
+	brw_cubemap_normalize.cpp \
+	brw_fs.cpp \
+	brw_fs_emit.cpp \
+	brw_fs_visitor.cpp \
+	brw_fs_channel_expressions.cpp \
+	brw_fs_reg_allocate.cpp \
+	brw_fs_schedule_instructions.cpp \
+	brw_fs_vector_splitting.cpp \
+	brw_shader.cpp
+i965_DRIVER_SOURCES := \
+	$(addprefix dri/i965/, $(i965_DRIVER_SOURCES)) \
+	$(addprefix dri/i965/, $(i965_CXX_SOURCES))
+
+# from dri/Makefile.template
+common_SOURCES = \
+	dri/common/utils.c \
+	dri/common/vblank.c \
+	dri/common/dri_util.c \
+	dri/common/xmlconfig.c \
+	dri/common/texmem.c \
+	dri/common/drirenderbuffer.c \
+	common/driverfuncs.c
+
+common_CFLAGS := \
+	-DFEATURE_GL=1 \
+	-DFEATURE_ES1=1 \
+	-DFEATURE_ES2=1
+
+common_C_INCLUDES := \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/glsl \
+	$(MESA_TOP)/src/mesa \
+	$(MESA_TOP)/src/mesa/drivers/dri/common \
+	$(DRM_TOP) \
+	$(DRM_TOP)/include/drm \
+	external/expat/lib
+
+common_STATIC_LIBRARIES := \
+	libmesa_dricore \
+	libmesa_glsl \
+	libmesa_glsl_utils
+
+common_SHARED_LIBRARIES := \
+	libglapi \
+	libdl \
+	libdrm \
+	libexpat \
+	liblog \
+	libcutils
+
+common_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
+
+ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(common_SOURCES) \
+	$(i915_DRIVER_SOURCES)
+
+LOCAL_CFLAGS := \
+	$(common_CFLAGS) \
+	-std=c99 \
+	-DI915
+
+LOCAL_C_INCLUDES := \
+	$(common_C_INCLUDES) \
+	$(MESA_TOP)/src/mesa/drivers/dri/intel \
+	$(DRM_TOP)/intel
+
+LOCAL_STATIC_LIBRARIES := \
+	$(common_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := \
+	$(common_SHARED_LIBRARIES) \
+	libdrm_intel
+
+LOCAL_MODULE := i915_dri
+LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_SHARED_LIBRARY)
+endif # i915
+
+ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(common_SOURCES) \
+	$(i965_DRIVER_SOURCES)
+
+LOCAL_CFLAGS := \
+	$(common_CFLAGS) \
+	-std=c99 \
+	-DI965
+
+LOCAL_C_INCLUDES := \
+	$(common_C_INCLUDES) \
+	$(MESA_TOP)/src/mesa/drivers/dri/intel \
+	$(DRM_TOP)/intel
+
+LOCAL_STATIC_LIBRARIES := \
+	$(common_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := \
+	$(common_SHARED_LIBRARIES) \
+	libdrm_intel
+
+LOCAL_MODULE := i965_dri
+LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_SHARED_LIBRARY)
+endif # i965