[Mesa-dev] [PATCH] Android: i965: remove libdrm_intel dependency

[Juan A. Suarez Romero]

Reviewed-by: Juan A. Suarez Romero <jasuarez at igalia.com>


On Wed, 2017-06-28 at 17:08 -0500, Rob Herring wrote:
> Commit 7dd20bc3ee8f ("anv/i965: drop libdrm_intel dependency completely")
> removed the libdrm_intel dependency for automake, but Android builds still
> depended on it. Now the build requires a newer version of i915_drm.h and
> fails on Android builds:
> 
> src/mesa/drivers/dri/i965/brw_performance_query.c:616:9: error: use of undeclared identifier 'I915_OA_FORMAT_A32u40_A4u32_B8_C8'
>    case I915_OA_FORMAT_A32u40_A4u32_B8_C8:
>         ^
> src/mesa/drivers/dri/i965/brw_performance_query.c:1887:18: error: use of undeclared identifier 'I915_PARAM_SLICE_MASK'
>       gp.param = I915_PARAM_SLICE_MASK;
>                  ^
> src/mesa/drivers/dri/i965/brw_performance_query.c:1893:18: error: use of undeclared identifier 'I915_PARAM_SUBSLICE_MASK'
>       gp.param = I915_PARAM_SUBSLICE_MASK;
>                  ^
> 
> Remove the libdrm_intel dependency for Android builds and add the necessary
> include paths for the local copy of i915_drm.h.
> 
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
>  src/mesa/drivers/dri/i965/Android.mk | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
> index 7ee9ab784c33..8996aec3b6a5 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -29,11 +29,11 @@ include $(LOCAL_PATH)/Makefile.sources
>  
>  I965_PERGEN_COMMON_INCLUDES := \
>  	$(MESA_DRI_C_INCLUDES) \
> -	$(MESA_TOP)/src/intel
> +	$(MESA_TOP)/src/intel \
> +	$(MESA_TOP)/src/intel/drm
>  
>  I965_PERGEN_SHARED_LIBRARIES := \
> -	$(MESA_DRI_SHARED_LIBRARIES) \
> -	libdrm_intel
> +	$(MESA_DRI_SHARED_LIBRARIES)
>  
>  I965_PERGEN_STATIC_LIBRARIES := \
>  	libmesa_genxml \
> @@ -257,7 +257,8 @@ LOCAL_CFLAGS += \
>  endif
>  
>  LOCAL_C_INCLUDES := \
> -	$(MESA_DRI_C_INCLUDES)
> +	$(MESA_DRI_C_INCLUDES) \
> +	$(MESA_TOP)/src/intel/drm
>  
>  LOCAL_SRC_FILES := \
>  	$(i965_FILES)
> @@ -271,8 +272,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
>  	libmesa_intel_compiler
>  
>  LOCAL_SHARED_LIBRARIES := \
> -	$(MESA_DRI_SHARED_LIBRARIES) \
> -	libdrm_intel
> +	$(MESA_DRI_SHARED_LIBRARIES)
>  
>  LOCAL_GENERATED_SOURCES := \
>  	$(MESA_DRI_OPTIONS_H) \