summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-07-30 15:09:02 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-30 15:09:02 -0400
commita48c54cddd789a570d9eb64f9844a420ecd99c0b (patch)
treecb9494a66a09bdfd25031a22231c961942e1a8b0
parent5f8f87df3d325e93f7cb517c0b34e0802cfa7acc (diff)
evas-wayland-shm: Provide wl_display to the surface structure
Summary: In order to fix an existing rendering issue, we need access to the wl_display so that we can dispatch events on the que while we wait for a free buffer Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 71e63a4af0..610673935a 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -74,6 +74,7 @@ struct _Shm_Leaf
74typedef struct _Shm_Surface Shm_Surface; 74typedef struct _Shm_Surface Shm_Surface;
75struct _Shm_Surface 75struct _Shm_Surface
76{ 76{
77 struct wl_display *disp;
77 struct wl_shm *shm; 78 struct wl_shm *shm;
78 struct wl_surface *surface; 79 struct wl_surface *surface;
79 uint32_t flags; 80 uint32_t flags;
@@ -116,14 +117,14 @@ struct _Outbuf
116 } priv; 117 } priv;
117}; 118};
118 119
119Shm_Surface *_evas_shm_surface_create(struct wl_shm *shm, struct wl_surface *surface, int w, int h, int num_buff, Eina_Bool alpha); 120Shm_Surface *_evas_shm_surface_create(struct wl_display *disp, struct wl_shm *shm, struct wl_surface *surface, int w, int h, int num_buff, Eina_Bool alpha);
120void _evas_shm_surface_destroy(Shm_Surface *surface); 121void _evas_shm_surface_destroy(Shm_Surface *surface);
121void _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h, int num_buff, uint32_t flags); 122void _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h, int num_buff, uint32_t flags);
122void *_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h); 123void *_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h);
123Eina_Bool _evas_shm_surface_assign(Shm_Surface *surface); 124Eina_Bool _evas_shm_surface_assign(Shm_Surface *surface);
124void _evas_shm_surface_post(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int count); 125void _evas_shm_surface_post(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int count);
125 126
126Outbuf *_evas_outbuf_setup(int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, struct wl_shm *shm, struct wl_surface *surface); 127Outbuf *_evas_outbuf_setup(int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, struct wl_shm *shm, struct wl_surface *surface, struct wl_display *disp);
127void _evas_outbuf_free(Outbuf *ob); 128void _evas_outbuf_free(Outbuf *ob);
128void _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode); 129void _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode);
129void _evas_outbuf_idle_flush(Outbuf *ob); 130void _evas_outbuf_idle_flush(Outbuf *ob);