Remove hack that causes deadlock when waiting in eglSwapBuffers
authorAndy Nichols <andy.nichols@nokia.com>
Thu, 9 Feb 2012 18:08:30 +0000 (19:08 +0100)
committerJørgen Lind <jorgen.lind@nokia.com>
Fri, 10 Feb 2012 13:08:50 +0000 (14:08 +0100)
commit0a25184b9af19786d8d20c520f93ee0bfc65355f
tree79a8a68724b8d47690de583e4d06b75eb7f8c16b
parent39aacb4dd11b6745a32d4404cee207c047177b07
Remove hack that causes deadlock when waiting in eglSwapBuffers

This hack was added to work around the problem of calling
wl_display_iterate in two separate threads, but now that we are
are enforceing that wl_display_iterate can only be called in one thread
it now causes a deadlock when we are waiting in eglSwapBuffers for the
gui thread to actually call wl_display_iterate.

Change-Id: Id3153b184c191494838fc363380f7cae621ac64e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp