[Mesa-dev] [PATCH mesa] egl/android: add missing include
Cc: Rob Herring Signed-off-by: Eric Engestrom --- This needs to land before [1], otherwise the latter will break android. [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html src/egl/drivers/dri2/platform_android.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index a864a2af3d..36fc5833b4 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -27,6 +27,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include #include -- Cheers, Eric ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom wrote: > Cc: Rob Herring > Signed-off-by: Eric Engestrom > --- > This needs to land before [1], otherwise the latter will break android. > > [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html > > src/egl/drivers/dri2/platform_android.c | 1 + > 1 file changed, 1 insertion(+) For both patches: Reviewed-by: Rob Herring ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On Thu, Aug 24, 2017 at 9:26 AM, Rob Herring wrote: > On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom > wrote: >> Cc: Rob Herring >> Signed-off-by: Eric Engestrom >> --- >> This needs to land before [1], otherwise the latter will break android. >> >> [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html >> >> src/egl/drivers/dri2/platform_android.c | 1 + >> 1 file changed, 1 insertion(+) > > For both patches: > > Reviewed-by: Rob Herring Actually, on further examination I think this isn't needed. egl_dri2.h includes system/window.h which in turn includes native_window.h. I'll test out the EGL change without this. Rob ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On Thursday, 2017-08-24 10:02:29 -0500, Rob Herring wrote: > On Thu, Aug 24, 2017 at 9:26 AM, Rob Herring wrote: > > On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom > > wrote: > >> Cc: Rob Herring > >> Signed-off-by: Eric Engestrom > >> --- > >> This needs to land before [1], otherwise the latter will break android. > >> > >> [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html > >> > >> src/egl/drivers/dri2/platform_android.c | 1 + > >> 1 file changed, 1 insertion(+) > > > > For both patches: > > > > Reviewed-by: Rob Herring > > Actually, on further examination I think this isn't needed. I pushed it a minute before your email: 688d866eca (I'm waiting on Emil (and maybe others?) to chime in on the khronos header change before I push it.) > egl_dri2.h includes system/window.h which in turn includes > native_window.h. I'll test out the EGL change without this. Personally, I like the include-what-you-use philosophy [1], so I'd rather have this include here anyway. [1] https://github.com/include-what-you-use/include-what-you-use/blob/master/docs/WhyIWYU.md ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On 08/24/2017 06:02 PM, Rob Herring wrote: On Thu, Aug 24, 2017 at 9:26 AM, Rob Herring wrote: On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom wrote: Cc: Rob Herring Signed-off-by: Eric Engestrom --- This needs to land before [1], otherwise the latter will break android. [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html src/egl/drivers/dri2/platform_android.c | 1 + 1 file changed, 1 insertion(+) For both patches: Reviewed-by: Rob Herring Actually, on further examination I think this isn't needed. egl_dri2.h includes system/window.h which in turn includes native_window.h. I'll test out the EGL change without this. Not 100% sure but you might need include for android_native_rect_t from 'arect' lib, it was moved there from 'nativewindow' lib // Tapani ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On Thu, Aug 24, 2017 at 10:09 AM, Tapani Pälli wrote: > > > On 08/24/2017 06:02 PM, Rob Herring wrote: >> >> On Thu, Aug 24, 2017 at 9:26 AM, Rob Herring wrote: >>> >>> On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom >>> wrote: Cc: Rob Herring Signed-off-by: Eric Engestrom --- This needs to land before [1], otherwise the latter will break android. [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html src/egl/drivers/dri2/platform_android.c | 1 + 1 file changed, 1 insertion(+) >>> >>> >>> For both patches: >>> >>> Reviewed-by: Rob Herring >> >> >> Actually, on further examination I think this isn't needed. egl_dri2.h >> includes system/window.h which in turn includes native_window.h. I'll >> test out the EGL change without this. >> > > Not 100% sure but you might need include for android_native_rect_t from > 'arect' lib, it was moved there from 'nativewindow' lib I checked this. At least for O it is implicitly added as an include path by libnativewindow. Rob ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
On Thu, Aug 24, 2017 at 10:08 AM, Eric Engestrom wrote: > On Thursday, 2017-08-24 10:02:29 -0500, Rob Herring wrote: >> On Thu, Aug 24, 2017 at 9:26 AM, Rob Herring wrote: >> > On Thu, Aug 24, 2017 at 9:22 AM, Eric Engestrom >> > wrote: >> >> Cc: Rob Herring >> >> Signed-off-by: Eric Engestrom >> >> --- >> >> This needs to land before [1], otherwise the latter will break android. >> >> >> >> [1] >> >> https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html >> >> >> >> src/egl/drivers/dri2/platform_android.c | 1 + >> >> 1 file changed, 1 insertion(+) >> > >> > For both patches: >> > >> > Reviewed-by: Rob Herring >> >> Actually, on further examination I think this isn't needed. > > I pushed it a minute before your email: 688d866eca > > (I'm waiting on Emil (and maybe others?) to chime in on the khronos > header change before I push it.) > >> egl_dri2.h includes system/window.h which in turn includes >> native_window.h. I'll test out the EGL change without this. > > Personally, I like the include-what-you-use philosophy [1], so I'd > rather have this include here anyway. I agree with that, but we don't actually use anything in android/native_window.h. native_window.h only provides an opaque struct. Everything we use is in system/window.h. With your eglplatform.h change alone and without my O fix, O builds for me. This is because they kept system/window.h for compatibility. Really, we're supposed to move to vndk/window.h and would need libnativewindow to pull that in. However, as long as we support pre-O, we're not going to be changing. Rob ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] egl/android: add missing include
2017-08-24 22:22 GMT+08:00 Eric Engestrom : > Cc: Rob Herring > Signed-off-by: Eric Engestrom > --- > This needs to land before [1], otherwise the latter will break android. > > [1] https://lists.freedesktop.org/archives/mesa-dev/2017-August/167428.html > > src/egl/drivers/dri2/platform_android.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/egl/drivers/dri2/platform_android.c > b/src/egl/drivers/dri2/platform_android.c > index a864a2af3d..36fc5833b4 100644 > --- a/src/egl/drivers/dri2/platform_android.c > +++ b/src/egl/drivers/dri2/platform_android.c > @@ -27,6 +27,7 @@ > * DEALINGS IN THE SOFTWARE. > */ > > +#include > #include > #include > #include > -- NACK. This breaks Android O sinlce the include path was changed. external/mesa/src/egl/drivers/dri2/platform_android.c:30:10: fatal error: 'android/native_window.h' file not found #include ^ 1 error generated. Actually Android O builds with [1] perfectly without this one. Not tested in pre-O. We (android-x86) have no plan to use the master branch with pre-O. -- Chih-Wei Android-x86 project http://www.android-x86.org ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
