[waffle] [PATCH] gbm: drop explicit linking against libgbm.so (v2)

[Emil Velikov]

On 12/11/14 06:03, Chad Versace wrote:
> From: Emil Velikov <emil.l.velikov at gmail.com>
> 
> Use the function pointers stored in wgbm_platform, to communicate
> with the library.
> 
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
> ---
> 
> v2(chadv): Fix numerous upcast errors of form:
> 
>     src/waffle/gbm/wgbm_display.c: In function ‘wgbm_display_connect’:
>     src/waffle/gbm/wgbm_display.c:121:12: warning: passing argument 1 of ‘wgbm_platform’ from incompatible pointer type [enabled by default]
>         struct wgbm_platform *plat = wgbm_platform(wc_plat);
>                 ^
>     In file included from src/waffle/core/wcore_display.h:32:0,
>                     from src/waffle/egl/wegl_display.h:33,
>                     from src/waffle/gbm/wgbm_display.h:33,
>                     from src/waffle/gbm/wgbm_display.c:39:
>     src/waffle/gbm/wgbm_platform.h:60:28: note: expected ‘struct wegl_platform *’ but argument is of type ‘struct wcore_platform *’
>     DEFINE_CONTAINER_CAST_FUNC(wgbm_platform,
>                                 ^
>     src/waffle/core/wcore_util.h:44:5: note: in definition of macro ‘DEFINE_CONTAINER_CAST_FUNC’
>         func_name(member_type *member##_self)                               \
>         ^
> 
I'm pretty sure I've addressed those and taking a closer look it seems
to be a merge slip.

For example v1 does
@@ -118,6 +118,8 @@ struct wcore_display*
 wgbm_display_connect(struct wcore_platform *wc_plat,
                      const char *name)
 {
+    struct wegl_platform *wegl_plat = wegl_platform(wc_plat);
+    struct wgbm_platform *plat = wgbm_platform(wegl_plat);

While v2 does:
@@ -119,6 +119,7 @@ wgbm_display_connect(struct wcore_platform *wc_plat,
                      const char *name)
 {
     struct wgbm_display *self;
+    struct wgbm_platform *plat = wgbm_platform(wegl_platform(wc_plat));



Afaics both patches are identical so either version is fine with me :)

Thanks
Emil

P.S. the series is based on top of master, as per your earlier
recommendation :) I'll make an explicit note for future series.