[Mesa-dev] [PATCH 1/2] android: add ilo to the build system

Mon May 6 02:56:46 PDT 2013

On 05/03/2013 10:44 AM, Chia-I Wu wrote:
> It can be selected with
>
>    BOARD_GPU_DRIVERS := ilo
>
> Signed-off-by: Chia-I Wu <olvaffe at gmail.com>

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

> ---
>   Android.mk                                |    4 +--
>   src/egl/main/Android.mk                   |    6 +++++
>   src/gallium/Android.mk                    |    5 ++++
>   src/gallium/drivers/ilo/Android.mk        |   39 ++++++++++++++++++++++++++++
>   src/gallium/targets/egl-static/Android.mk |    3 +++
>   src/gallium/winsys/intel/drm/Android.mk   |   40 +++++++++++++++++++++++++++++
>   6 files changed, 95 insertions(+), 2 deletions(-)
>   create mode 100644 src/gallium/drivers/ilo/Android.mk
>   create mode 100644 src/gallium/winsys/intel/drm/Android.mk
>
> diff --git a/Android.mk b/Android.mk
> index 80c0e13..c3c1f08 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -24,7 +24,7 @@
>   # BOARD_GPU_DRIVERS should be defined.  The valid values are
>   #
>   #   classic drivers: i915 i965
> -#   gallium drivers: swrast i915g nouveau r300g r600g radeonsi vmwgfx
> +#   gallium drivers: swrast i915g ilo nouveau r300g r600g radeonsi vmwgfx
>   #
>   # 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.
> @@ -42,7 +42,7 @@ DRM_TOP := external/drm
>   DRM_GRALLOC_TOP := hardware/drm_gralloc
>   
>   classic_drivers := i915 i965
> -gallium_drivers := swrast i915g nouveau r300g r600g radeonsi vmwgfx
> +gallium_drivers := swrast i915g ilo nouveau r300g r600g radeonsi vmwgfx
>   
>   MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
>   
> diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
> index 3751ecf..b2cbe05 100644
> --- a/src/egl/main/Android.mk
> +++ b/src/egl/main/Android.mk
> @@ -103,6 +103,12 @@ gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915
>   LOCAL_SHARED_LIBRARIES += libdrm_intel
>   endif
>   
> +# ilo
> +ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),)
> +gallium_DRIVERS += libmesa_winsys_intel libmesa_pipe_ilo
> +LOCAL_SHARED_LIBRARIES += libdrm_intel
> +endif
> +
>   # nouveau
>   ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
>   gallium_DRIVERS += \
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
> index 1d002d0..4e5acc8 100644
> --- a/src/gallium/Android.mk
> +++ b/src/gallium/Android.mk
> @@ -39,6 +39,11 @@ ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
>   SUBDIRS += winsys/i915/drm drivers/i915
>   endif
>   
> +# ilo
> +ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),)
> +SUBDIRS += winsys/intel/drm drivers/ilo
> +endif
> +
>   # nouveau
>   ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
>   SUBDIRS += \
> diff --git a/src/gallium/drivers/ilo/Android.mk b/src/gallium/drivers/ilo/Android.mk
> new file mode 100644
> index 0000000..5e70d3d
> --- /dev/null
> +++ b/src/gallium/drivers/ilo/Android.mk
> @@ -0,0 +1,39 @@
> +# Mesa 3-D graphics library
> +#
> +# Copyright (C) 2013 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.
> +
> +LOCAL_PATH := $(call my-dir)
> +
> +# get C_SOURCES
> +include $(LOCAL_PATH)/Makefile.sources
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_C_INCLUDES := \
> +	$(LOCAL_PATH)/include \
> +	$(GALLIUM_TOP)/winsys/intel/drm
> +
> +LOCAL_SRC_FILES := $(C_SOURCES)
> +
> +LOCAL_MODULE := libmesa_pipe_ilo
> +
> +include $(GALLIUM_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk
> index 99c0812..06975db 100644
> --- a/src/gallium/targets/egl-static/Android.mk
> +++ b/src/gallium/targets/egl-static/Android.mk
> @@ -56,6 +56,9 @@ endif
>   ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
>   LOCAL_CFLAGS += -D_EGL_PIPE_I915=1
>   endif
> +ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),)
> +LOCAL_CFLAGS += -D_EGL_PIPE_ILO=1
> +endif
>   ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
>   LOCAL_CFLAGS += -D_EGL_PIPE_NOUVEAU=1
>   endif
> diff --git a/src/gallium/winsys/intel/drm/Android.mk b/src/gallium/winsys/intel/drm/Android.mk
> new file mode 100644
> index 0000000..a375b59
> --- /dev/null
> +++ b/src/gallium/winsys/intel/drm/Android.mk
> @@ -0,0 +1,40 @@
> +# Mesa 3-D graphics library
> +#
> +# Copyright (C) 2013 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.
> +
> +LOCAL_PATH := $(call my-dir)
> +
> +# get C_SOURCES
> +include $(LOCAL_PATH)/Makefile.sources
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_SRC_FILES := $(C_SOURCES)
> +
> +LOCAL_C_INCLUDES := \
> +	$(DRM_TOP) \
> +	$(DRM_TOP)/include/drm \
> +	$(DRM_TOP)/intel
> +
> +LOCAL_MODULE := libmesa_winsys_intel
> +
> +include $(GALLIUM_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)