diff options
author | Ander Conselvan de Oliveira <[email protected]> | 2012-11-30 17:41:02 +0200 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2012-11-30 11:08:04 -0500 |
commit | ca3ed3e024864e91ca3cccc59fb96950e1d079b5 (patch) | |
tree | b93557df91947ab72cff269c8d6c3800fc8500cf /src/egl/wayland/wayland-egl/wayland-egl.c | |
parent | b5c53245afcb35632cc662ff7f84a578eba864c3 (diff) |
egl/wayland: Don't invalidate drawable on swap buffers
We used to invalidate the drawable after a call to eglSwapBuffers(),
so that a wl_egl_window_resize() would take effect for the next frame.
However, that leads to calling dri2_get_buffers() when eglMakeCurrent()
is called with the current context and surface, and a later call to
wl_egl_window_resize() would not take effect until the next buffer
swap.
Instead, add a callback from wl_egl_window_resize() back to the wayland
egl platform, and invalidate the drawable only when it is resized.
This solves a bug on wayland clients when going back to windowed mode
from fullscreen when clicking a pop up menu, where the window size
after this would be the fullscreen size.
Note: this is a candidate for stable branches.
CC: [email protected]
Diffstat (limited to 'src/egl/wayland/wayland-egl/wayland-egl.c')
-rw-r--r-- | src/egl/wayland/wayland-egl/wayland-egl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c index c61fb4f2c3a..8bd49cf6c4f 100644 --- a/src/egl/wayland/wayland-egl/wayland-egl.c +++ b/src/egl/wayland/wayland-egl/wayland-egl.c @@ -13,6 +13,9 @@ wl_egl_window_resize(struct wl_egl_window *egl_window, egl_window->height = height; egl_window->dx = dx; egl_window->dy = dy; + + if (egl_window->resize_callback) + egl_window->resize_callback(egl_window, egl_window->private); } WL_EGL_EXPORT struct wl_egl_window * @@ -26,6 +29,8 @@ wl_egl_window_create(struct wl_surface *surface, return NULL; egl_window->surface = surface; + egl_window->private = NULL; + egl_window->resize_callback = NULL; wl_egl_window_resize(egl_window, width, height, 0, 0); egl_window->attached_width = 0; egl_window->attached_height = 0; |