[Mesa-dev] [PATCH 2/2] egl/drivers/haiku: Fix reference to disp vs dpy

[Eric Engestrom]

On Friday, 2019-01-11 14:20:38 +0000, Emil Velikov wrote:
> On Wed, 2 Jan 2019 at 13:48, Eric Engestrom <eric.engestrom at intel.com> wrote:
> >
> > On Thursday, 2018-12-27 20:41:47 +0000, Alexander von Gluck IV wrote:
> > > ---
> > >  src/egl/drivers/haiku/egl_haiku.cpp | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
> > > index a9c5cf8d29..d4b046c79b 100644
> > > --- a/src/egl/drivers/haiku/egl_haiku.cpp
> > > +++ b/src/egl/drivers/haiku/egl_haiku.cpp
> > > @@ -29,6 +29,7 @@
> > >
> > >  #include "eglconfig.h"
> > >  #include "eglcontext.h"
> > > +#include "egldevice.h"
> > >  #include "egldisplay.h"
> > >  #include "egldriver.h"
> > >  #include "eglcurrent.h"
> > > @@ -215,7 +216,7 @@ init_haiku(_EGLDriver *drv, _EGLDisplay *dpy)
> > >               _eglError(EGL_NOT_INITIALIZED, "DRI2: failed to find EGLDevice");
> > >               return EGL_FALSE;
> > >       }
> > > -     disp->Device = dev;
> > > +     dpy->Device = dev;
> > >
> > >       TRACE("Add configs\n");
> > >       if (!haiku_add_configs_for_visuals(dpy))
> > > --
> > > 2.14.5
> >
> > Thanks!
> >
> > Pushed with these tags added:
> > Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
> > Fixes: 00992700c9a812a54563 "egl: set the EGLDevice when creating a display"
> 
> Thanks guys. I think we should follow-up with s/dpy/disp/ to align the
> haiku code with the rest.
> Otherwise we might end up doing such mistake again :-\

Ack on the idea, but a quick grep shows that both dri2 and haiku have
a mix of both `dpy` and `disp`, so make sure you fix them all ;)