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

[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 breaks as soon as someone does an update
and resolved this manually in the update-commit, because in that case
git will have no clue about the difference between the previous
upstream and the diffs on top.

On Fri, Sep 9, 2016 at 5:00 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 9 September 2016 at 15:26, Kyle Brenneman <kyle.brenneman at gmail.com> 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 every(?) time.
>
> Thanks
> Emil
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev