mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'bnf/fixes-2'

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-06-21 11:31:38 -04:00
parent 8f0ce05f52 fb4b5a293a
commit 2468692c9f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-client.c
+1 -2
View File
@@ -361,8 +361,7 @@ main(int argc, char **argv)
create_surface(&window); create_surface(&window);
init_gl(&window); init_gl(&window);
wl_display_frame_callback(display.display, window.surface, redraw(window.surface, &window, 0);
redraw, &window);
while (true) while (true)
wl_display_iterate(display.display, display.mask); wl_display_iterate(display.display, display.mask);
compositor/compositor.c
+2
View File
@@ -280,6 +280,8 @@ wlsc_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
wl_list_remove(&es->buffer_link); wl_list_remove(&es->buffer_link);
wl_list_insert(surfaces_attached_to, &es->buffer_link); wl_list_insert(surfaces_attached_to, &es->buffer_link);
} else { } else {
if (es->image != EGL_NO_IMAGE_KHR)
ec->destroy_image(ec->display, es->image);
es->image = ec->create_image(ec->display, NULL, es->image = ec->create_image(ec->display, NULL,
EGL_WAYLAND_BUFFER_WL, EGL_WAYLAND_BUFFER_WL,
buffer, NULL); buffer, NULL);