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

[Emil Velikov]

On 29 June 2017 at 12:20, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 28 June 2017 at 23:08, Rob Herring <robh at kernel.org> 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>
> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>
... and pushed to master, alongside Mauro's ANV build fix.

-Emil