[Mesa-dev] android: patches for upcoming mesa 17.0 release

[Emil Velikov]

On 10 January 2017 at 00:52, Mauro Rossi <issor.oruam at gmail.com> wrote:
>
> Hi,
>
> I'm sending a series of 12 patches for android,
> comprising fixes for build errors, LLVMInitializeAMDGPU* declarations,
> Android 7 fixes and a (small) i915 patch for feature parity with i965.
>
> Tested with nougat-x86 and marshmallow-x86
>
Nice work Mauro !

> Mauro
>
>
> Changelog:
>
> [building errors/trailing whitespaces]
>
> android: st/mesa: fix building error in libmesa_st_mesa
> st/dri: remove trailing whitespace
These two
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

> android: define HAVE___BUILTIN_{FFS,FFSLL}
>
Tapani is spot on here. Patch is not needed.

> [LLVMInitializeAMDGPU * functions declaration]
>
> android: radeon: fix LLVMInitializeAMDGPU* functions declaration
> android: radeonsi: fix LLVMInitializeAMDGPU* functions declaration
> android: amd/common: fix LLVMInitializeAMDGPU* functions declaration
>
IMHO this approach looks a lot better. Thank you !
Acked-by: Emil Velikov <emil.velikov at collabora.com>

Marek, I hope you/others are OK with these ?

> [Android 7 - based on Chih-Wei single patch, now splitted for convenience]
>
> android: add support for Android 7.0 with llvm 3.8
> android: fix libelf include path for Android 7.0
As you can see from the patches things are getting very messy. Ideally
we won't have _all_ the Android version checks in one or two files.

I'm thinking of something like the following, but I'm sure you can
think other solutions.
For example:

$ cat Android.mk // or the common.mk one if you think it's better

case "$MESA_ANDROID_MAJOR_VERSION" in
5)
   EGL_INCLUDES := external/elfutils/0.153
   OTHER_FANCY_VAR := ...
   ;;
6)
   EGL_INCLUDES := external/elfutils/...
   OTHER_FANCY_VAR := ...
   ;;
...
esac

Then one can use $(EGL_INCLUDES) in src/amd/Android.common.mk and friends.

> android: gallium/auxiliary: fix building error in Android 7.0
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

> android: gallium/targets/dri: libz static dependency for Android 7.0
This indicates a bug in either the libelf package or the Android build
system itself.
Ideally we'll get that fixed, but we can merge this patch in as long
as it has a HACK XXX or similar tag + a comment.

> android: gallium/targets/dri: remove blank static libraries definition
>
Can we leave this in, since it's not at all obvious that the Android
build already initialises the variable (alongside dozens of others).

> [i915 functional aligment to i965 - resubmitted with changes requested]
>
> i915: add mock implementation of GL_OES_EGL_image_external (v2)
Did you had the change to test this wioth dEQP/other test suite ? Did
you notice any issues ?
If so please mention in the commit message.

Either way - commit is reasonably well isolated and is:
Acked-by: Emil Velikov <emil.velikov at collabora.com>

Thanks for the hard work Mauro !
Emil