dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_wl2: fix ecore_wl2_buffer_wl_buffer_get 

It was currently only used internally and had the side effect of
creating a new buffer instead of just returning the existing one.

Now it's useful to external callers, as it only returns the existing
wl_buffer and has no freaky side effects.
This commit is contained in:
Derek Foreman 2018-01-26 13:30:31 -06:00
parent 0fc4fa7156
commit 288b693ac4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/ecore_wl2/Ecore_Wl2.h
View File

@ -2006,7 +2006,7 @@ EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rect
EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types);
EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha);
EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b);
EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer *buf);
EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf);
EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride);
EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf);
EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf);

6
src/lib/ecore_wl2/ecore_wl2_buffer.c
View File

@ -616,9 +616,9 @@ _buffer_manager_alloc(const char *name, int w, int h, unsigned long *stride, int
}
EAPI struct wl_buffer *
ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer *buf)
ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf)
{
return buffer_manager->to_buffer(ewd, buf);
return buf->wl_buffer;
}
EAPI void *
@ -777,7 +777,7 @@ ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha)
out = _ecore_wl2_buffer_partial_create(w, h, alpha);
if (!out) return NULL;
out->wl_buffer = ecore_wl2_buffer_wl_buffer_get(ewd, out);
out->wl_buffer = buffer_manager->to_buffer(ewd, out);
return out;
}