enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

wayland_shm: stop storing wl_display in dmabuf_surface 

Query it through the engine info's ecore_wl2_display instead.
This commit is contained in:
Derek Foreman 2017-09-12 09:54:33 -05:00
parent ceb90779ff
commit c72b0b44ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/evas/engines/wayland_shm/evas_dmabuf.c
View File

@ -70,7 +70,6 @@ struct _Dmabuf_Buffer
struct _Dmabuf_Surface struct _Dmabuf_Surface
{ {
Surface *surface; Surface *surface;
struct wl_display *wl_display;
int compositor_version; int compositor_version;
Dmabuf_Buffer *current; Dmabuf_Buffer *current;
@ -632,6 +631,9 @@ static Dmabuf_Buffer *
_evas_dmabuf_surface_wait(Dmabuf_Surface *s) _evas_dmabuf_surface_wait(Dmabuf_Surface *s)
{ {
int iterations = 0, i; int iterations = 0, i;
struct wl_display *disp;
disp = ecore_wl2_display_get(s->surface->info->info.wl2_display);
while (iterations++ < 10) while (iterations++ < 10)
{ {
@ -641,7 +643,7 @@ _evas_dmabuf_surface_wait(Dmabuf_Surface *s)
!s->buffer[i]->pending) !s->buffer[i]->pending)
return s->buffer[i]; return s->buffer[i];
wl_display_dispatch_pending(s->wl_display); wl_display_dispatch_pending(disp);
} }
/* May be we have a possible render target that just hasn't been /* May be we have a possible render target that just hasn't been
@ -787,7 +789,6 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff)
surf = s->surf.dmabuf; surf = s->surf.dmabuf;
surf->surface = s; surf->surface = s;
surf->wl_display = ecore_wl2_display_get(s->info->info.wl2_display);
surf->alpha = s->info->info.destination_alpha; surf->alpha = s->info->info.destination_alpha;
surf->compositor_version = s->info->info.compositor_version; surf->compositor_version = s->info->info.compositor_version;