[PATCH weston 2/7] weston-egl-ext.h: remove EGL_EGLEXT_PROTOTYPES sections

[Pekka Paalanen]

On Mon,  4 Jul 2016 15:27:14 +0100
Emil Velikov <emil.l.velikov at gmail.com> wrote:

> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Those the function declarations alongside the EGL_EGLEXT_PROTOTYPES
> guards. Although those are copy/paste sections from the header(s),
> having and/or using them is a bad idea, as per the EGL spec.
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> If people like them one could keep them I, but considering they are not
> used (and they shouldn't be used) it's better to remove them.
> ---
>  libweston/weston-egl-ext.h | 10 ----------
>  1 file changed, 10 deletions(-)

Hi Emil,

it seems pretty hard to make a mind on this change. Daniel is leaning
on kinda maybe not and I was leaning on kinda maybe yes. The policy of
being a copy vs. not having stuff we don't use.

I'll choose to solve this on the "copy" side. We copy whole extension
blocks into this file regardless whether all the bits are actually used
or not, particularly all the #defines. To follow that logic, let's drop
this patch.


Thanks,
pq

> 
> diff --git a/libweston/weston-egl-ext.h b/libweston/weston-egl-ext.h
> index 32f6108..e1754f5 100644
> --- a/libweston/weston-egl-ext.h
> +++ b/libweston/weston-egl-ext.h
> @@ -33,10 +33,6 @@
>  
>  struct wl_display;
>  
> -#ifdef EGL_EGLEXT_PROTOTYPES
> -EGLAPI EGLBoolean EGLAPIENTRY eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
> -EGLAPI EGLBoolean EGLAPIENTRY eglUnbindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display);
> -#endif
>  typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
>  typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
>  #endif
> @@ -63,18 +59,12 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy,
>  #define EGL_TEXTURE_EXTERNAL_WL         0x31DA
>  
>  struct wl_resource;
> -#ifdef EGL_EGLEXT_PROTOTYPES
> -EGLAPI EGLBoolean EGLAPIENTRY eglQueryWaylandBufferWL(EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
> -#endif
>  typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
>  #endif
>  
>  #ifndef EGL_WL_create_wayland_buffer_from_image
>  #define EGL_WL_create_wayland_buffer_from_image 1
>  
> -#ifdef EGL_EGLEXT_PROTOTYPES
> -EGLAPI struct wl_buffer * EGLAPIENTRY eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImageKHR image);
> -#endif
>  typedef struct wl_buffer * (EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL) (EGLDisplay dpy, EGLImageKHR image);
>  #endif
>  

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20160812/95c9dfce/attachment.sig>