styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dmabuf breakage of non wayland builds. 

#IWearTheHatOfShame
This commit is contained in:
Derek Foreman 2016-05-19 10:17:52 -05:00
parent bd1847162e
commit e5e875ded8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_pixmap.c
View File

@ -684,10 +684,12 @@ e_pixmap_is_pixels(E_Pixmap *cp)
{
case E_PIXMAP_TYPE_X:
return EINA_FALSE;
#ifdef HAVE_WAYLAND
case E_PIXMAP_TYPE_WL:
if (!cp->buffer) return EINA_TRUE;
if (cp->buffer->shm_buffer) return EINA_TRUE;
return EINA_FALSE;
#endif
default:
return EINA_TRUE;
}
@ -1043,6 +1045,7 @@ e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...)
va_end(l);
}
#ifdef HAVE_WAYLAND
E_API Eina_Bool
e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf)
{
@ -1064,3 +1067,4 @@ e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf)
return EINA_TRUE;
}
#endif

2
src/bin/e_pixmap.h
View File

@ -53,7 +53,9 @@ E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *
E_API void e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...);
#ifdef HAVE_WAYLAND
E_API Eina_Bool e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *);
#endif
static inline Eina_Bool
e_pixmap_is_x(const E_Pixmap *cp)