[Mesa-dev] [PATCH 3/4] vc4: Add support for building on Android.

[Emil Velikov]

On 09/06/15 20:06, Eric Anholt wrote:
> ---
>  Android.mk                            |  2 +-
>  src/gallium/Android.mk                |  5 +++++
>  src/gallium/drivers/vc4/Android.mk    | 39 +++++++++++++++++++++++++++++++++++
>  src/gallium/targets/dri/Android.mk    |  4 ++++
>  src/gallium/winsys/vc4/drm/Android.mk | 34 ++++++++++++++++++++++++++++++
>  5 files changed, 83 insertions(+), 1 deletion(-)
>  create mode 100644 src/gallium/drivers/vc4/Android.mk
>  create mode 100644 src/gallium/winsys/vc4/drm/Android.mk
> 
> diff --git a/Android.mk b/Android.mk
> index 341978a..7497748 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -48,7 +48,7 @@ MESA_PYTHON2 := python
>  DRM_GRALLOC_TOP := hardware/drm_gralloc
>  
>  classic_drivers := i915 i965
> -gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx
> +gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx vc4
>  
Please add vc4 to the other gallium_drivers list (the comments
section). It's slightly annoying but it's a once of thing :-)

>  MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
>  
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
> index a9c34d9..b946681 100644
> --- a/src/gallium/Android.mk
> +++ b/src/gallium/Android.mk
> @@ -76,6 +76,11 @@ endif
>  endif
>  endif
>  
> +# vc4
> +ifneq ($(filter vc4, $(MESA_GPU_DRIVERS)),)
> +SUBDIRS += winsys/vc4/drm drivers/vc4
> +endif
> +
>  # vmwgfx
>  ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
>  SUBDIRS += winsys/svga/drm drivers/svga
> diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk
> new file mode 100644
> index 0000000..d048435
> --- /dev/null
> +++ b/src/gallium/drivers/vc4/Android.mk
> @@ -0,0 +1,39 @@
> +# Copyright (C) 2014 Emil Velikov <emil.l.velikov at gmail.com>
> +#
> +# 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_CFLAGS := \
> +	-Wno-packed-bitfield-compat
I think that you can drop this. I've only added it for freedreno, as
that was explicitly handled by the automake build.

> +
> +LOCAL_SHARED_LIBRARIES := libdrm
> +LOCAL_STATIC_LIBRARIES := libmesa_glsl
Why do we need this one ... is it for the nir generated sources includes
path ? Can you add a comment please.

-Emil