mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follow wayland-egl renames

Browse source
This commit is contained in:
Kristian Høgsberg 2011-02-07 10:30:38 -05:00
parent c9824ddf35
commit bfb8e61381
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
clients/simple-client.c
View file

@ -197,10 +197,10 @@ create_surface(struct window *window)
window->surface = wl_compositor_create_surface(display->compositor); window->surface = wl_compositor_create_surface(display->compositor);
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = wl_display_get_premultiplied_argb_visual(display->display);
window->native = window->native =
wl_egl_native_window_create(window->surface, wl_egl_window_create(window->surface,
window->geometry.width, window->geometry.width,
window->geometry.height, window->geometry.height,
visual); visual);
window->egl_surface = window->egl_surface =
eglCreateWindowSurface(display->egl.dpy, eglCreateWindowSurface(display->egl.dpy,
display->egl.conf, display->egl.conf,
@ -308,7 +308,7 @@ main(int argc, char **argv)
wl_display_add_global_listener(display.display, wl_display_add_global_listener(display.display,
display_handle_global, &display); display_handle_global, &display);
display.native = wl_egl_native_display_create(display.display); display.native = wl_egl_display_create(display.display);
init_egl(&display); init_egl(&display);
create_surface(&window); create_surface(&window);

17
clients/window.c
View file

@ -206,7 +206,7 @@ egl_image_surface_data_destroy(void *p)
eglDestroyImageKHR(d->dpy, data->image); eglDestroyImageKHR(d->dpy, data->image);
wl_buffer_destroy(data->data.buffer); wl_buffer_destroy(data->data.buffer);
wl_egl_native_pixmap_destroy(data->pixmap); wl_egl_pixmap_destroy(data->pixmap);
free(p); free(p);
} }
@ -237,10 +237,10 @@ display_create_egl_image_surface(struct display *display,
data->display = display; data->display = display;
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = wl_display_get_premultiplied_argb_visual(display->display);
data->pixmap =wl_egl_native_pixmap_create(display->native_dpy, data->pixmap =wl_egl_pixmap_create(display->native_dpy,
rectangle->width, rectangle->width,
rectangle->height, rectangle->height,
visual, 0); visual, 0);
if (data->pixmap == NULL) { if (data->pixmap == NULL) {
free(data); free(data);
return NULL; return NULL;
@ -250,14 +250,13 @@ display_create_egl_image_surface(struct display *display,
EGL_NATIVE_PIXMAP_KHR, EGL_NATIVE_PIXMAP_KHR,
(EGLClientBuffer) data->pixmap, NULL); (EGLClientBuffer) data->pixmap, NULL);
if (data->image == EGL_NO_IMAGE_KHR) { if (data->image == EGL_NO_IMAGE_KHR) {
wl_egl_native_pixmap_destroy(data->pixmap); wl_egl_pixmap_destroy(data->pixmap);
free(data); free(data);
return NULL; return NULL;
} }
data->data.buffer = data->data.buffer =
wl_egl_native_pixmap_create_buffer(display->native_dpy, wl_egl_pixmap_create_buffer(display->native_dpy, data->pixmap);
data->pixmap);
cairo_device_acquire(display->device); cairo_device_acquire(display->device);
glGenTextures(1, &data->texture); glGenTextures(1, &data->texture);
@ -1673,7 +1672,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
wl_display_add_global_listener(d->display, wl_display_add_global_listener(d->display,
display_handle_global, d); display_handle_global, d);
d->native_dpy = wl_egl_native_display_create(d->display); d->native_dpy = wl_egl_display_create(d->display);
/* Process connection events. */ /* Process connection events. */
wl_display_iterate(d->display, WL_DISPLAY_READABLE); wl_display_iterate(d->display, WL_DISPLAY_READABLE);