Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h

2016-09-12 Thread Erik Faye-Lund
An easy-ish way of upgrading a single source file from an upstream and keeping the changes that were done on top, is to branch out from the last update-commit, and update there. Then when merged, git will understand that the changes on top should still be applied when merging. Unfortunately, it

Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h

2016-09-09 Thread Emil Velikov
On 9 September 2016 at 15:26, Kyle Brenneman wrote: > Would it be better to use the new upstream version of eglext.h and add the > #includes, or to keep Mesa's existing eglext.h and add the missing > declarations for EGL_KHR_debug? > Afaict we've been doing the former

Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h

2016-09-09 Thread Kyle Brenneman
Would it be better to use the new upstream version of eglext.h and add the #includes, or to keep Mesa's existing eglext.h and add the missing declarations for EGL_KHR_debug? -Kyle On 09/09/2016 03:31 AM, Emil Velikov wrote: On 8 September 2016 at 18:46, Adam Jackson wrote:

Re: [Mesa-dev] [PATCH 1/7] EGL: Update eglext.h

2016-09-09 Thread Emil Velikov
On 8 September 2016 at 18:46, Adam Jackson wrote: > From: Kyle Brenneman > > Updated eglext.h to revision 32074 from the Khronos repository. > > Added two #includes to egltypedefs.h. Both were in the previous version > of eglext.h but not in the new one.

[Mesa-dev] [PATCH 1/7] EGL: Update eglext.h

2016-09-08 Thread Adam Jackson
From: Kyle Brenneman Updated eglext.h to revision 32074 from the Khronos repository. Added two #includes to egltypedefs.h. Both were in the previous version of eglext.h but not in the new one. Reviewed-by: Adam Jackson --- include/EGL/eglext.h |