[waffle] [PATCH 6/7] egl: Update wegl_display_init signature
Chad Versace
chadversary at chromium.org
Tue Oct 18 16:58:26 UTC 2016
Change the type of parameter 'native_display' from intptr_t to void*.
No intended change in behavior. Prepares for eventual use of
eglGetPlatformDisplay, whose 'native_display' parameter has type void*.
---
src/waffle/android/droid_display.c | 3 +--
src/waffle/egl/wegl_display.c | 2 +-
src/waffle/egl/wegl_display.h | 2 +-
src/waffle/gbm/wgbm_display.c | 2 +-
src/waffle/wayland/wayland_display.c | 2 +-
src/waffle/xegl/xegl_display.c | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/waffle/android/droid_display.c b/src/waffle/android/droid_display.c
index 3f39739..5724c39 100644
--- a/src/waffle/android/droid_display.c
+++ b/src/waffle/android/droid_display.c
@@ -51,8 +51,7 @@ droid_display_connect(struct wcore_platform *wc_plat,
if (self->pSFContainer == NULL)
goto error;
- ok = wegl_display_init(&self->wegl, wc_plat,
- (intptr_t) EGL_DEFAULT_DISPLAY);
+ ok = wegl_display_init(&self->wegl, wc_plat, EGL_DEFAULT_DISPLAY);
if (!ok)
goto error;
diff --git a/src/waffle/egl/wegl_display.c b/src/waffle/egl/wegl_display.c
index bd7d375..7a7986c 100644
--- a/src/waffle/egl/wegl_display.c
+++ b/src/waffle/egl/wegl_display.c
@@ -95,7 +95,7 @@ get_extensions(struct wegl_display *dpy)
bool
wegl_display_init(struct wegl_display *dpy,
struct wcore_platform *wc_plat,
- intptr_t native_display)
+ void *native_display)
{
struct wegl_platform *plat = wegl_platform(wc_plat);
bool ok;
diff --git a/src/waffle/egl/wegl_display.h b/src/waffle/egl/wegl_display.h
index 348399d..e828257 100644
--- a/src/waffle/egl/wegl_display.h
+++ b/src/waffle/egl/wegl_display.h
@@ -57,7 +57,7 @@ DEFINE_CONTAINER_CAST_FUNC(wegl_display,
bool
wegl_display_init(struct wegl_display *dpy,
struct wcore_platform *wc_plat,
- intptr_t native_display);
+ void *native_display);
bool
wegl_display_teardown(struct wegl_display *dpy);
diff --git a/src/waffle/gbm/wgbm_display.c b/src/waffle/gbm/wgbm_display.c
index 5c8af29..b7c5397 100644
--- a/src/waffle/gbm/wgbm_display.c
+++ b/src/waffle/gbm/wgbm_display.c
@@ -154,7 +154,7 @@ wgbm_display_connect(struct wcore_platform *wc_plat,
goto error;
}
- ok = wegl_display_init(&self->wegl, wc_plat, (intptr_t) self->gbm_device);
+ ok = wegl_display_init(&self->wegl, wc_plat, self->gbm_device);
if (!ok)
goto error;
diff --git a/src/waffle/wayland/wayland_display.c b/src/waffle/wayland/wayland_display.c
index e2d59a8..6373056 100644
--- a/src/waffle/wayland/wayland_display.c
+++ b/src/waffle/wayland/wayland_display.c
@@ -142,7 +142,7 @@ wayland_display_connect(struct wcore_platform *wc_plat,
goto error;
}
- ok = wegl_display_init(&self->wegl, wc_plat, (intptr_t) self->wl_display);
+ ok = wegl_display_init(&self->wegl, wc_plat, self->wl_display);
if (!ok)
goto error;
diff --git a/src/waffle/xegl/xegl_display.c b/src/waffle/xegl/xegl_display.c
index a1da480..1d1b7dd 100644
--- a/src/waffle/xegl/xegl_display.c
+++ b/src/waffle/xegl/xegl_display.c
@@ -62,7 +62,7 @@ xegl_display_connect(
if (!ok)
goto error;
- ok = wegl_display_init(&self->wegl, wc_plat, (intptr_t) self->x11.xlib);
+ ok = wegl_display_init(&self->wegl, wc_plat, self->x11.xlib);
if (!ok)
goto error;
--
2.10.0
More information about the waffle
mailing list