[Mesa-dev] [PATCH 25/32] i965: Move gen6_blorp.c to a file that gets recompiled per-gen

[Jason Ekstrand]

Thanks for fixing these up!  I've already pushed the series, so these can
be squashed and applied as one patch.  Unfortunately, I can't get them to
apply to master and I can't figure out what's going wrong.  Mind squashing
and rebasing?


On Fri, Aug 19, 2016 at 3:46 PM, Mauro Rossi <issor.oruam at gmail.com> wrote:

> From 88e08ee520b7c8a14b17160a9e7102d72fed8ecb Mon Sep 17 00:00:00 2001
> From: Mauro Rossi <issor.oruam at gmail.com>
> Date: Sat, 20 Aug 2016 00:04:29 +0200
> Subject: [PATCH 3/3] android: i965: add per-gen libmesa_i965_gen{8,9}
> static
>
> Needed to fix android build after commit 16a9fcb
> which enabled genxml for gen{8,9} state setup
>
> This is the last patch needed, android build tested successfully.
> ---
>  src/mesa/drivers/dri/i965/Android.mk | 46 ++++++++++++++++++++++++++++++
> +++++-
>  1 file changed, 45 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/Android.mk
> b/src/mesa/drivers/dri/i965/Android.mk
> index 9dea20b..e6bcedb 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -42,7 +42,9 @@ I965_PERGEN_STATIC_LIBRARIES := \
>  I965_PERGEN_LIBS := \
>   libmesa_i965_gen6 \
>   libmesa_i965_gen7 \
> - libmesa_i965_gen75
> + libmesa_i965_gen75 \
> + libmesa_i965_gen8 \
> + libmesa_i965_gen9
>
>  # ---------------------------------------
>  # Build libmesa_i965_gen6
> @@ -108,6 +110,48 @@ include $(MESA_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)
>
>  # ---------------------------------------
> +# Build libmesa_i965_gen8
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_i965_gen8
> +
> +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(i965_gen8_FILES)
> +
> +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
> +
> +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=80
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_i965_gen9
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_i965_gen9
> +
> +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(i965_gen9_FILES)
> +
> +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
> +
> +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=90
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
>  # Build i965_dri
>  # ---------------------------------------
>
> --
> 2.7.4
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160820/4ab0ab52/attachment.html>